add a check for libmysql

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 9eaac249cc309e286f24f698d571649e5fdf3ce6..81bae23a5fd661974fc96978b99b57dcb3fb7bc6 100644 (file)
--- 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 dbdda9bc5e68faf53c6e094ecb8863eb73b744c9..394073610c4dcf6eb0f0f7d5031b0f8531c4ff5d 100644 (file)
--- 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: