com php-src: add a check for libmysql: ext/mysqli/mysqli.c ext/mysqli/mysqli_api.c
| From: | Andrey Hristov | Date: | Wed, 03 Oct 2012 12:14:59 +0000 |
| Subject: | com php-src: add a check for libmysql: ext/mysqli/mysqli.c ext/mysqli/mysqli_api.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70304@lists.php.net to get a copy of this message | ||
Commit: 06dfb96bf5a532e2af4a714f60b48a6874b9637a
Author: Andrey Hristov <andrey@php.net> Wed, 3 Oct 2012 14:14:59 +0200
Parents: 3262de2f62b9bca20e0d977e77df19bbf0e5bf78
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=06dfb96bf5a532e2af4a714f60b48a6874b9637a
Log:
add a check for libmysql
Changed paths:
M ext/mysqli/mysqli.c
M ext/mysqli/mysqli_api.c
Diff:
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 9eaac24...81bae23 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -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);
#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);
+#endif
/* mysqli_real_connect flags */
REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_SSL", CLIENT_SSL, CONST_CS | CONST_PERSISTENT);
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index dbdda9b..3940736 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1627,7 +1627,9 @@ static int mysqli_options_get_option_zval_type(int option)
case MYSQL_INIT_COMMAND:
case MYSQL_SET_CHARSET_NAME:
case MYSQL_SET_CHARSET_DIR:
+#if MYSQL_VERSION_ID > 50605 || defined(MYSQLI_USE_MYSQLND)
case MYSQL_SERVER_PUBLIC_KEY:
+#endif
return IS_STRING;
default: