summaryrefslogtreecommitdiff
path: root/ext/mysqli/mysqli_api.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2012-10-03 14:14:59 +0200
committerAndrey Hristov <andrey@php.net>2012-10-03 14:14:59 +0200
commit06dfb96bf5a532e2af4a714f60b48a6874b9637a (patch)
tree07b144a39e74f43cfed7e531c156e69b7319e7d3 /ext/mysqli/mysqli_api.c
parent3262de2f62b9bca20e0d977e77df19bbf0e5bf78 (diff)
downloadphp-git-06dfb96bf5a532e2af4a714f60b48a6874b9637a.tar.gz
add a check for libmysql
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
-rw-r--r--ext/mysqli/mysqli_api.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index dbdda9bc5e..394073610c 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: