andrey Mon Oct 27 14:33:10 2008 UTC Modified files: /php-src/ext/mysqli/tests bug34810.phpt mysqli_connect_oo_defaults.phpt mysqli_constants.phpt mysqli_get_client_stats.phpt Log: Fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug34810.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/mysqli/tests/bug34810.phpt diff -u php-src/ext/mysqli/tests/bug34810.phpt:1.7 php-src/ext/mysqli/tests/bug34810.phpt:1.8 --- php-src/ext/mysqli/tests/bug34810.phpt:1.7 Tue Mar 18 16:58:43 2008 +++ php-src/ext/mysqli/tests/bug34810.phpt Mon Oct 27 14:33:09 2008 @@ -52,7 +52,7 @@ ["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"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt diff -u php-src/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt:1.1 php-src/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt:1.2 --- php-src/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt:1.1 Mon Jul 23 12:15:20 2007 +++ php-src/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt Mon Oct 27 14:33:09 2008 @@ -9,7 +9,6 @@ $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 @@ printf("[002] Usage of mysqli.default_socket failed\n"); } - ini_set('mysqli.default_port', $port); try { $mysqli = mysqli_init(); @@ -195,4 +193,4 @@ [u"all_defaults"]=> unicode(13) "have been set" } -done! \ No newline at end of file +done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_constants.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_constants.phpt diff -u php-src/ext/mysqli/tests/mysqli_constants.phpt:1.5 php-src/ext/mysqli/tests/mysqli_constants.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_constants.phpt:1.5 Tue Mar 18 16:58:43 2008 +++ php-src/ext/mysqli/tests/mysqli_constants.phpt Mon Oct 27 14:33:09 2008 @@ -48,6 +48,9 @@ "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 @@ ); /* 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 @@ 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( http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.5 php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.5 Mon Jan 28 22:54:21 2008 +++ php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt Mon Oct 27 14:33:09 2008 @@ -859,7 +859,7 @@ print "done!"; ?> --EXPECTF-- -array(61) { +array(119) { ["bytes_sent"]=> string(1) "0" ["bytes_received"]=> @@ -872,6 +872,36 @@ 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 @@ 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 @@ 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 @@ ... done with fetch statistics done! --UEXPECTF-- -array(61) { +array(119) { [u"bytes_sent"]=> unicode(1) "0" [u"bytes_received"]=> @@ -1009,6 +1125,36 @@ 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 @@ 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 @@ 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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php