Make the constants deprecated

Author: kamil-tekiela

ext/mysqli/mysqli.c

@@ -720,6 +720,12 @@ PHP_MINIT_FUNCTION(mysqli)
 	REGISTER_LONG_CONSTANT("MYSQLI_SET_CHARSET_NAME", MYSQL_SET_CHARSET_NAME, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_SET_CHARSET_DIR", MYSQL_SET_CHARSET_DIR, CONST_CS | CONST_PERSISTENT);
 
+	/* bind support */
+	REGISTER_LONG_CONSTANT("MYSQLI_NO_DATA", MYSQL_NO_DATA, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
+#ifdef MYSQL_DATA_TRUNCATED
+	REGISTER_LONG_CONSTANT("MYSQLI_DATA_TRUNCATED", MYSQL_DATA_TRUNCATED, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
+#endif
+
 	/* reporting */
 	REGISTER_LONG_CONSTANT("MYSQLI_REPORT_INDEX", MYSQLI_REPORT_INDEX, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_REPORT_ERROR", MYSQLI_REPORT_ERROR, CONST_CS | CONST_PERSISTENT);
@@ -738,6 +744,15 @@ PHP_MINIT_FUNCTION(mysqli)
 #endif
 #endif
 
+	REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED", SERVER_QUERY_NO_GOOD_INDEX_USED, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
+	REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_NO_INDEX_USED", SERVER_QUERY_NO_INDEX_USED, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
+#ifdef SERVER_QUERY_WAS_SLOW
+	REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_WAS_SLOW", SERVER_QUERY_WAS_SLOW, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
+#endif
+#ifdef SERVER_PS_OUT_PARAMS
+	REGISTER_LONG_CONSTANT("MYSQLI_SERVER_PS_OUT_PARAMS", SERVER_PS_OUT_PARAMS, CONST_CS | CONST_PERSISTENT | CONST_DEPRECATED);
+#endif
+
 	REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_GRANT",      REFRESH_GRANT, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_LOG",        REFRESH_LOG, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_TABLES",     REFRESH_TABLES, CONST_CS | CONST_PERSISTENT);

ext/mysqli/tests/mysqli_constants.phpt

@@ -49,7 +49,9 @@ mysqli.allow_local_infile=1
         "MYSQLI_ENUM_FLAG"					=> true,
         "MYSQLI_BINARY_FLAG"				=> true,
         "MYSQLI_PART_KEY_FLAG"				=> true,
-        "MYSQLI_GROUP_FLAG"					=> true,
+        "MYSQLI_GROUP_FLAG" 				=> true,
+        "MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED"=> true,
+        "MYSQLI_SERVER_QUERY_NO_INDEX_USED"	=> true,
 
         "MYSQLI_TYPE_DECIMAL"				=> true,
         "MYSQLI_TYPE_TINY"					=> true,
@@ -77,6 +79,7 @@ mysqli.allow_local_infile=1
         "MYSQLI_TYPE_CHAR"					=> true,
         "MYSQLI_TYPE_INTERVAL"				=> true,
         "MYSQLI_TYPE_GEOMETRY"				=> true,
+        "MYSQLI_NO_DATA"					=> true,
         "MYSQLI_REPORT_INDEX"				=> true,
         "MYSQLI_REPORT_STRICT"				=> true,
         "MYSQLI_REPORT_ALL"					=> true,
@@ -121,6 +124,8 @@ mysqli.allow_local_infile=1
         $expected_constants['MYSQLI_OPT_NET_CMD_BUFFER_SIZE'] = true;
         $expected_constants['MYSQLI_OPT_NET_READ_BUFFER_SIZE'] = true;
         $expected_constants['MYSQLI_ASYNC'] = true;
+
+        $expected_constants['MYSQLI_SERVER_PS_OUT_PARAMS'] = true;
     } else {
         $version = mysqli_get_client_version();
     }
@@ -129,6 +134,11 @@ mysqli.allow_local_infile=1
         $expected_constants['MYSQLI_ON_UPDATE_NOW_FLAG'] = true;
     }
 
+    /* First introduced in MySQL 6.0, backported to MySQL 5.5 */
+    if ($version >= 50500 || $IS_MYSQLND) {
+        $expected_constants['MYSQLI_SERVER_QUERY_WAS_SLOW'] = true;
+    }
+
     $expected_constants['MYSQLI_CLIENT_SSL_VERIFY_SERVER_CERT'] = true;
     if ($IS_MYSQLND) {
         $expected_constants['MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT'] = true;
@@ -162,6 +172,9 @@ mysqli.allow_local_infile=1
         $expected_constants['MYSQLI_OPT_SSL_VERIFY_SERVER_CERT'] = true;
     }
 
+    /* pretty dump test, but that is the best way to mimic mysql.c */
+    $expected_constants["MYSQLI_DATA_TRUNCATED"] = true;
+
     if ($IS_MYSQLND || (!$IS_MYSQLND && ($version > 50610))) {
         /* could be that MySQL/libmysql 5.6.9 had the flag already but it was no stable release */
         $expected_constants["MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS"] = true;