Fix tests

diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt
index 99bc7b6d7669b9970f009f79ae00b8a015547286..9ddba2317398795f98366a07a3c9f612e9a4191d 100644 (file)
--- a/ext/mysqli/tests/bug34810.phpt
+++ b/ext/mysqli/tests/bug34810.phpt
@@ -52,7 +52,7 @@ object(mysqli)#%d (%d) {
   ["field_count"]=>
   int(0)
   ["host_info"]=>
-  string(42) "MySQL host info: Localhost via UNIX socket"
+  string(%d) "MySQL host info: %s via %s%s"
   ["info"]=>
   NULL
   ["insert_id"]=>

diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
index d9ba6f246cd255237f476aa8f5e00daa5434dae9..6a72c249fe7dfbb37a38f188ef962d86d6d35fd8 100644 (file)
--- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
@@ -9,7 +9,6 @@ new mysqli()
 
        $tmp    = NULL;
        $link   = NULL;
-
        ini_set('mysqli.default_socket', 'socket');
        ini_set('mysqli.default_port', 9999);
        ini_set('mysqli.default_pw', 'password');
@@ -36,7 +35,6 @@ new mysqli()
                printf("[002] Usage of mysqli.default_socket failed\n");
        }
 
-
        ini_set('mysqli.default_port', $port);
        try {
                $mysqli = mysqli_init();
@@ -195,4 +193,4 @@ array(1) {
   [u"all_defaults"]=>
   unicode(13) "have been set"
 }
-done!
\ No newline at end of file
+done!

diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt
index 6cd09c652be0a795bb53f5c641d193e7014ae378..e68529bda1da7240319e2c44489c73ff23777b9d 100644 (file)
--- a/ext/mysqli/tests/mysqli_constants.phpt
+++ b/ext/mysqli/tests/mysqli_constants.phpt
@@ -48,6 +48,9 @@ require_once('skipifconnectfailure.inc');
                "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,
                "MYSQLI_TYPE_SHORT"                                     => true,
@@ -84,8 +87,8 @@ require_once('skipifconnectfailure.inc');
        );
 
        /* depends on the build - experimental */
-       if ($IS_MYSQLND && defined('MYSQLI_OPT_INT_AND_YEARS_AS_INT')) {
-               $expected_constants['MYSQLI_OPT_INT_AND_YEARS_AS_INT'] = true;
+       if ($IS_MYSQLND && defined('MYSQLI_OPT_INT_AND_FLOAT_NATIVE')) {
+               $expected_constants['MYSQLI_OPT_INT_AND_FLOAT_NATIVE'] = true;
        }
 
        if ($IS_MYSQLND) {
@@ -101,6 +104,9 @@ require_once('skipifconnectfailure.inc');
        if (($version > 51122 && $version < 60000) || ($version > 60003) || $IS_MYSQLND) {
                $expected_constants['MYSQLI_ON_UPDATE_NOW_FLAG'] = true;
        }
+       if ($version > 60005 || $IS_MYSQLND) {
+               $expected_constants['MYSQLI_SERVER_QUERY_WAS_SLOW'] = true;     
+       } 
 
        if ($version > 50002) {
                $expected_constants = array_merge($expected_constants, array(

diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index 042f14bd99c43b06b9630582d53ae4de41fca508..e59f029ed14875e952d1ec535df9624768f742ef 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -859,7 +859,7 @@ mysqlnd.collect_memory_statistics=1
        print "done!";
 ?>
 --EXPECTF--
-array(61) {
+array(119) {
   ["bytes_sent"]=>
   string(1) "0"
   ["bytes_received"]=>
@@ -872,6 +872,36 @@ array(61) {
   string(1) "0"
   ["protocol_overhead_out"]=>
   string(1) "0"
+  ["bytes_received_ok_packet"]=>
+  string(1) "0"
+  ["bytes_received_eof_packet"]=>
+  string(1) "0"
+  ["bytes_received_rset_header_packet"]=>
+  string(1) "0"
+  ["bytes_received_rset_field_meta_packet"]=>
+  string(1) "0"
+  ["bytes_received_rset_row_packet"]=>
+  string(1) "0"
+  ["bytes_received_prepare_response_packet"]=>
+  string(1) "0"
+  ["bytes_received_change_user_packet"]=>
+  string(1) "0"
+  ["packets_sent_command"]=>
+  string(1) "0"
+  ["packets_received_ok"]=>
+  string(1) "0"
+  ["packets_received_eof"]=>
+  string(1) "0"
+  ["packets_received_rset_header"]=>
+  string(1) "0"
+  ["packets_received_rset_field_meta"]=>
+  string(1) "0"
+  ["packets_received_rset_row"]=>
+  string(1) "0"
+  ["packets_received_prepare_response"]=>
+  string(1) "0"
+  ["packets_received_change_user"]=>
+  string(1) "0"
   ["result_set_queries"]=>
   string(1) "0"
   ["non_result_set_queries"]=>
@@ -880,6 +910,8 @@ array(61) {
   string(1) "0"
   ["bad_index_used"]=>
   string(1) "0"
+  ["slow_queries"]=>
+  string(1) "0"
   ["buffered_sets"]=>
   string(1) "0"
   ["unbuffered_sets"]=>
@@ -976,12 +1008,96 @@ array(61) {
   string(1) "0"
   ["mem_calloc_ammount"]=>
   string(1) "0"
-  ["mem_realloc_calloc"]=>
+  ["mem_realloc_count"]=>
   string(1) "0"
   ["mem_realloc_ammount"]=>
   string(1) "0"
   ["mem_free_count"]=>
   string(1) "0"
+  ["proto_text_fetched_null"]=>
+  string(1) "0"
+  ["proto_text_fetched_bit"]=>
+  string(1) "0"
+  ["proto_text_fetched_tinyint"]=>
+  string(1) "0"
+  ["proto_text_fetched_short"]=>
+  string(1) "0"
+  ["proto_text_fetched_int24"]=>
+  string(1) "0"
+  ["proto_text_fetched_int"]=>
+  string(1) "0"
+  ["proto_text_fetched_bigint"]=>
+  string(1) "0"
+  ["proto_text_fetched_decimal"]=>
+  string(1) "0"
+  ["proto_text_fetched_float"]=>
+  string(1) "0"
+  ["proto_text_fetched_double"]=>
+  string(1) "0"
+  ["proto_text_fetched_date"]=>
+  string(1) "0"
+  ["proto_text_fetched_year"]=>
+  string(1) "0"
+  ["proto_text_fetched_time"]=>
+  string(1) "0"
+  ["proto_text_fetched_datetime"]=>
+  string(1) "0"
+  ["proto_text_fetched_timestamp"]=>
+  string(1) "0"
+  ["proto_text_fetched_string"]=>
+  string(1) "0"
+  ["proto_text_fetched_blob"]=>
+  string(1) "0"
+  ["proto_text_fetched_enum"]=>
+  string(1) "0"
+  ["proto_text_fetched_set"]=>
+  string(1) "0"
+  ["proto_text_fetched_geometry"]=>
+  string(1) "0"
+  ["proto_text_fetched_other"]=>
+  string(1) "0"
+  ["proto_binary_fetched_null"]=>
+  string(1) "0"
+  ["proto_binary_fetched_bit"]=>
+  string(1) "0"
+  ["proto_binary_fetched_tinyint"]=>
+  string(1) "0"
+  ["proto_binary_fetched_short"]=>
+  string(1) "0"
+  ["proto_binary_fetched_int24"]=>
+  string(1) "0"
+  ["proto_binary_fetched_int"]=>
+  string(1) "0"
+  ["proto_binary_fetched_bigint"]=>
+  string(1) "0"
+  ["proto_binary_fetched_decimal"]=>
+  string(1) "0"
+  ["proto_binary_fetched_float"]=>
+  string(1) "0"
+  ["proto_binary_fetched_double"]=>
+  string(1) "0"
+  ["proto_binary_fetched_date"]=>
+  string(1) "0"
+  ["proto_binary_fetched_year"]=>
+  string(1) "0"
+  ["proto_binary_fetched_time"]=>
+  string(1) "0"
+  ["proto_binary_fetched_datetime"]=>
+  string(1) "0"
+  ["proto_binary_fetched_timestamp"]=>
+  string(1) "0"
+  ["proto_binary_fetched_string"]=>
+  string(1) "0"
+  ["proto_binary_fetched_blob"]=>
+  string(1) "0"
+  ["proto_binary_fetched_enum"]=>
+  string(1) "0"
+  ["proto_binary_fetched_set"]=>
+  string(1) "0"
+  ["proto_binary_fetched_geometry"]=>
+  string(1) "0"
+  ["proto_binary_fetched_other"]=>
+  string(1) "0"
 }
 Testing buffered normal...
 Testing buffered normal... - SELECT id, label FROM test
@@ -996,7 +1112,7 @@ Testing unbuffered Prepared Statements... - fetching all but one
 ... done with fetch statistics
 done!
 --UEXPECTF--
-array(61) {
+array(119) {
   [u"bytes_sent"]=>
   unicode(1) "0"
   [u"bytes_received"]=>
@@ -1009,6 +1125,36 @@ array(61) {
   unicode(1) "0"
   [u"protocol_overhead_out"]=>
   unicode(1) "0"
+  [u"bytes_received_ok_packet"]=>
+  unicode(1) "0"
+  [u"bytes_received_eof_packet"]=>
+  unicode(1) "0"
+  [u"bytes_received_rset_header_packet"]=>
+  unicode(1) "0"
+  [u"bytes_received_rset_field_meta_packet"]=>
+  unicode(1) "0"
+  [u"bytes_received_rset_row_packet"]=>
+  unicode(1) "0"
+  [u"bytes_received_prepare_response_packet"]=>
+  unicode(1) "0"
+  [u"bytes_received_change_user_packet"]=>
+  unicode(1) "0"
+  [u"packets_sent_command"]=>
+  unicode(1) "0"
+  [u"packets_received_ok"]=>
+  unicode(1) "0"
+  [u"packets_received_eof"]=>
+  unicode(1) "0"
+  [u"packets_received_rset_header"]=>
+  unicode(1) "0"
+  [u"packets_received_rset_field_meta"]=>
+  unicode(1) "0"
+  [u"packets_received_rset_row"]=>
+  unicode(1) "0"
+  [u"packets_received_prepare_response"]=>
+  unicode(1) "0"
+  [u"packets_received_change_user"]=>
+  unicode(1) "0"
   [u"result_set_queries"]=>
   unicode(1) "0"
   [u"non_result_set_queries"]=>
@@ -1017,6 +1163,8 @@ array(61) {
   unicode(1) "0"
   [u"bad_index_used"]=>
   unicode(1) "0"
+  [u"slow_queries"]=>
+  unicode(1) "0"
   [u"buffered_sets"]=>
   unicode(1) "0"
   [u"unbuffered_sets"]=>
@@ -1113,12 +1261,96 @@ array(61) {
   unicode(1) "0"
   [u"mem_calloc_ammount"]=>
   unicode(1) "0"
-  [u"mem_realloc_calloc"]=>
+  [u"mem_realloc_count"]=>
   unicode(1) "0"
   [u"mem_realloc_ammount"]=>
   unicode(1) "0"
   [u"mem_free_count"]=>
   unicode(1) "0"
+  [u"proto_text_fetched_null"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_bit"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_tinyint"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_short"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_int24"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_int"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_bigint"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_decimal"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_float"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_double"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_date"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_year"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_time"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_datetime"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_timestamp"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_unicode"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_blob"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_enum"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_set"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_geometry"]=>
+  unicode(1) "0"
+  [u"proto_text_fetched_other"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_null"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_bit"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_tinyint"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_short"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_int24"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_int"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_bigint"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_decimal"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_float"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_double"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_date"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_year"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_time"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_datetime"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_timestamp"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_unicode"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_blob"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_enum"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_set"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_geometry"]=>
+  unicode(1) "0"
+  [u"proto_binary_fetched_other"]=>
+  unicode(1) "0"
 }
 Testing buffered normal...
 Testing buffered normal... - SELECT id, label FROM test