archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

add a check for libmysql

Browse source
This commit is contained in:
Andrey Hristov 2012-10-03 14:14:59 +02:00
parent 3262de2f62
commit 06dfb96bf5
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/mysqli/mysqli.c
View file

@ -699,7 +699,9 @@ PHP_MINIT_FUNCTION(mysqli)
REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);
#endif #endif
#if MYSQL_VERSION_ID > 50605 || defined(MYSQLI_USE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_SERVER_PUBLIC_KEY", MYSQL_SERVER_PUBLIC_KEY, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_SERVER_PUBLIC_KEY", MYSQL_SERVER_PUBLIC_KEY, CONST_CS | CONST_PERSISTENT);
#endif
/* mysqli_real_connect flags */ /* mysqli_real_connect flags */
REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_SSL", CLIENT_SSL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_SSL", CLIENT_SSL, CONST_CS | CONST_PERSISTENT);

2
ext/mysqli/mysqli_api.c
View file

@ -1627,7 +1627,9 @@ static int mysqli_options_get_option_zval_type(int option)
case MYSQL_INIT_COMMAND: case MYSQL_INIT_COMMAND:
case MYSQL_SET_CHARSET_NAME: case MYSQL_SET_CHARSET_NAME:
case MYSQL_SET_CHARSET_DIR: case MYSQL_SET_CHARSET_DIR:
#if MYSQL_VERSION_ID > 50605 || defined(MYSQLI_USE_MYSQLND)
case MYSQL_SERVER_PUBLIC_KEY: case MYSQL_SERVER_PUBLIC_KEY:
#endif
return IS_STRING; return IS_STRING;
default: default: