Remove constants

Author: kamil-tekiela

ext/mysqli/mysqli.c

@@ -744,15 +744,6 @@ 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);
-	REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_NO_INDEX_USED", SERVER_QUERY_NO_INDEX_USED, CONST_CS | CONST_PERSISTENT);
-#ifdef SERVER_QUERY_WAS_SLOW
-	REGISTER_LONG_CONSTANT("MYSQLI_SERVER_QUERY_WAS_SLOW", SERVER_QUERY_WAS_SLOW, CONST_CS | CONST_PERSISTENT);
-#endif
-#ifdef SERVER_PS_OUT_PARAMS
-	REGISTER_LONG_CONSTANT("MYSQLI_SERVER_PS_OUT_PARAMS", SERVER_PS_OUT_PARAMS, CONST_CS | CONST_PERSISTENT);
-#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

@@ -50,8 +50,6 @@ mysqli.allow_local_infile=1
         "MYSQLI_BINARY_FLAG"				=> true,
         "MYSQLI_PART_KEY_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,
@@ -124,8 +122,6 @@ 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();
     }
@@ -134,11 +130,6 @@ 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;
@@ -176,9 +167,6 @@ mysqli.allow_local_infile=1
     if (defined('MYSQLI_DATA_TRUNCATED'))
         $expected_constants["MYSQLI_DATA_TRUNCATED"] = true;
 
-    if (defined('MYSQLI_SERVER_PS_OUT_PARAMS'))
-        $expected_constants["MYSQLI_SERVER_PS_OUT_PARAMS"] = true;
-
     if (!$IS_MYSQLND) {
         /* libmysql only */