cvs: php-src /ext/mysqli/tests 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt
015.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 029.phpt 032.phpt 036.phpt 037.phpt 038.phpt 040.phpt 041.phpt
042.phpt 043.phpt 046.phpt 047.phpt 048.phpt 057.phpt 058.phpt 059.phpt 060.phpt 061.phpt 066.phpt 067.phpt bug32405.phpt bug34810.phpt bug35103.phpt
bug35517.phpt bug35759.phpt bug36745.phpt bug36949.phpt bug37090.phpt bug42378.phpt bug42548.phpt bug44897.phpt bug45289.phpt clean_table.inc
mysqli_affected_rows.phpt mysqli_affected_rows_oo.phpt mysqli_autocommit.phpt mysqli_autocommit_oo.phpt mysqli_change_user_get_lock.phpt
mysqli_change_user_insert_id.phpt mysqli_change_user_locks_temporary.phpt mysqli_change_user_rollback.phpt mysqli_character_set.phpt
mysqli_class_mysqli_warning.phpt mysqli_commit.phpt mysqli_commit_oo.phpt mysqli_data_seek.phpt mysqli_data_seek_oo.phpt mysql! i_debug.phpt
mysqli_debug_append.phpt mysqli_debug_mysqlnd_control_string.phpt mysqli_debug_mysqlnd_only.phpt mysqli_disable_reads_from_master.phpt
mysqli_errno.phpt mysqli_errno_oo.phpt mysqli_explain_metadata.phpt mysqli_fetch_all.phpt mysqli_fetch_all_oo.phpt mysqli_fetch_array_assoc.phpt
mysqli_fetch_array_many_rows.phpt mysqli_fetch_array_oo.phpt mysqli_fetch_assoc.phpt mysqli_fetch_assoc_bit.phpt mysqli_fetch_assoc_oo.phpt
mysqli_fetch_assoc_zerofill.phpt mysqli_fetch_field.phpt mysqli_fetch_field_direct.phpt mysqli_fetch_field_direct_oo.phpt
mysqli_fetch_field_flags.phpt mysqli_fetch_field_oo.phpt mysqli_fetch_field_types.phpt mysqli_fetch_fields.phpt mysqli_fetch_lengths.phpt
mysqli_fetch_lengths_oo.phpt mysqli_fetch_object.phpt mysqli_fetch_object_no_constructor.phpt mysqli_fetch_object_no_object.phpt
mysqli_fetch_object_oo.phpt mysqli_fetch_row.phpt mysqli_field_count.phpt mysqli_field_seek.phpt mysqli_field_tell.phpt mysqli_fork.phpt
mysqli_free_result.phpt mysql! i_get_cache_stats.phpt mysqli_get_cache_stats_free_buffered.phpt mysqli_get_cache_stats_off.phpt
mysqli_get_charset.phpt mysqli_get_client_stats.phpt mysqli_get_client_stats_implicit_free.phpt mysqli_get_client_stats_off.phpt
mysqli_get_client_stats_ps.phpt mysqli_get_connection_stats.phpt mysqli_get_host_info.phpt mysqli_ge

uw Mon Jul 6 14:36:54 2009 UTC Added files: /php-src/ext/mysqli/tests clean_table.inc Modified files: /php-src/ext/mysqli/tests 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 029.phpt 032.phpt 036.phpt 037.phpt 038.phpt 040.phpt 041.phpt 042.phpt 043.phpt 046.phpt 047.phpt 048.phpt 057.phpt 058.phpt 059.phpt 060.phpt 061.phpt 066.phpt 067.phpt bug32405.phpt bug34810.phpt bug35103.phpt bug35517.phpt bug35759.phpt bug36745.phpt bug36949.phpt bug37090.phpt bug42378.phpt bug42548.phpt bug44897.phpt bug45289.phpt mysqli_affected_rows.phpt mysqli_affected_rows_oo.phpt mysqli_autocommit.phpt mysqli_autocommit_oo.phpt mysqli_change_user_get_lock.phpt mysqli_change_user_insert_id.phpt mysqli_change_user_locks_temporary.phpt mysqli_change_user_rollback.phpt mysqli_character_set.phpt mysqli_class_mysqli_warning.phpt mysqli_commit.phpt mysqli_commit_oo.phpt mysqli_data_seek.phpt mysqli_data_seek_oo.phpt mysqli_debug.phpt mysqli_debug_append.phpt mysqli_debug_mysqlnd_control_string.phpt mysqli_debug_mysqlnd_only.phpt mysqli_disable_reads_from_master.phpt mysqli_errno.phpt mysqli_errno_oo.phpt mysqli_explain_metadata.phpt mysqli_fetch_all.phpt mysqli_fetch_all_oo.phpt mysqli_fetch_array_assoc.phpt mysqli_fetch_array_many_rows.phpt mysqli_fetch_array_oo.phpt mysqli_fetch_assoc.phpt mysqli_fetch_assoc_bit.phpt mysqli_fetch_assoc_oo.phpt mysqli_fetch_assoc_zerofill.phpt mysqli_fetch_field.phpt mysqli_fetch_field_direct.phpt mysqli_fetch_field_direct_oo.phpt mysqli_fetch_field_flags.phpt mysqli_fetch_field_oo.phpt mysqli_fetch_field_types.phpt mysqli_fetch_fields.phpt mysqli_fetch_lengths.phpt mysqli_fetch_lengths_oo.phpt mysqli_fetch_object.phpt mysqli_fetch_object_no_constructor.phpt mysqli_fetch_object_no_object.phpt mysqli_fetch_object_oo.phpt mysqli_fetch_row.phpt mysqli_field_count.phpt mysqli_field_seek.phpt mysqli_field_tell.phpt mysqli_fork.phpt mysqli_free_result.phpt mysqli_get_cache_stats.phpt mysqli_get_cache_stats_free_buffered.phpt mysqli_get_cache_stats_off.phpt mysqli_get_charset.phpt mysqli_get_client_stats.phpt mysqli_get_client_stats_implicit_free.phpt mysqli_get_client_stats_off.phpt mysqli_get_client_stats_ps.phpt mysqli_get_connection_stats.phpt mysqli_get_host_info.phpt mysqli_get_server_info.phpt mysqli_get_warnings.phpt mysqli_info.phpt mysqli_insert_id.phpt mysqli_insert_id_variation.phpt mysqli_kill.phpt mysqli_max_links.phpt mysqli_more_results.phpt mysqli_multi_query.phpt mysqli_mysqli_result_invalid_mode.phpt mysqli_next_result.phpt mysqli_num_fields.phpt mysqli_num_rows.phpt mysqli_pconn_kill.phpt mysqli_pconn_limits.phpt mysqli_pconn_max_links.phpt mysqli_poll_mixing_insert_select.phpt mysqli_prepare.phpt mysqli_prepare_no_object.phpt mysqli_query.phpt mysqli_query_local_infile_large.phpt mysqli_query_stored_proc.phpt mysqli_real_connect.phpt mysqli_real_connect_pconn.phpt mysqli_real_query.phpt mysqli_report.phpt mysqli_report_wo_ps.phpt mysqli_result_references.phpt mysqli_rollback.phpt mysqli_set_charset.phpt mysqli_set_local_infile_default.phpt mysqli_set_local_infile_handler.phpt mysqli_set_local_infile_handler_bad_character.phpt mysqli_set_local_infile_handler_buffer_overflow.phpt mysqli_set_local_infile_handler_close_link.phpt mysqli_set_local_infile_handler_closefile.phpt mysqli_set_local_infile_handler_closures.phpt mysqli_set_local_infile_handler_kill_link.phpt mysqli_set_local_infile_handler_negative_len.phpt mysqli_set_local_infile_handler_nested_call.phpt mysqli_set_local_infile_handler_new_query.phpt mysqli_set_local_infile_handler_nofileop.phpt mysqli_set_local_infile_handler_openbasedir.phpt mysqli_set_local_infile_handler_replace_buffer.phpt mysqli_set_local_infile_handler_short_len.phpt mysqli_set_local_infile_handler_unregister.phpt mysqli_set_opt_numeric_and_datetime_as_unicode.phpt mysqli_sqlstate.phpt mysqli_stmt_affected_rows.phpt mysqli_stmt_attr_get.phpt mysqli_stmt_attr_get_prefetch.phpt mysqli_stmt_attr_set.phpt mysqli_stmt_bind_param.phpt mysqli_stmt_bind_param_call_user_func.phpt mysqli_stmt_bind_param_check_param_no_change.phpt mysqli_stmt_bind_param_references.phpt mysqli_stmt_bind_param_type_juggling.phpt mysqli_stmt_bind_result.phpt mysqli_stmt_bind_result_bit.phpt mysqli_stmt_bind_result_format.phpt mysqli_stmt_bind_result_references.phpt mysqli_stmt_bind_result_zerofill.phpt mysqli_stmt_close.phpt mysqli_stmt_data_seek.phpt mysqli_stmt_datatype_change.phpt mysqli_stmt_errno.phpt mysqli_stmt_error.phpt mysqli_stmt_execute.phpt mysqli_stmt_execute_stored_proc.phpt mysqli_stmt_fetch.phpt mysqli_stmt_fetch_bit.phpt mysqli_stmt_fetch_fields_win32_unicode.phpt mysqli_stmt_field_count.phpt mysqli_stmt_free_result.phpt mysqli_stmt_get_result.phpt mysqli_stmt_get_result2.phpt mysqli_stmt_get_result_bit.phpt mysqli_stmt_get_result_field_count.phpt mysqli_stmt_get_result_metadata.phpt mysqli_stmt_get_result_metadata_fetch_field.phpt mysqli_stmt_get_result_non_select.phpt mysqli_stmt_get_result_seek.phpt mysqli_stmt_get_result_types.phpt mysqli_stmt_get_warnings.phpt mysqli_stmt_init.phpt mysqli_stmt_insert_id.phpt mysqli_stmt_num_rows.phpt mysqli_stmt_param_count.phpt mysqli_stmt_prepare.phpt mysqli_stmt_reset.phpt mysqli_stmt_result_metadata.phpt mysqli_stmt_result_metadata_sqltests.phpt mysqli_stmt_send_long_data.phpt mysqli_stmt_send_long_data_packet_size_libmysql.phpt mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt mysqli_stmt_sqlstate.phpt mysqli_stmt_store_result.phpt mysqli_store_result.phpt mysqli_thread_id.phpt mysqli_use_result.phpt mysqli_warning_count.phpt mysqli_warning_unclonable.phpt Log: Adding --CLEAN-- sections to all ext/mysqli tests

http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/002.phpt?r1=1.12&r2=1.13&diff_format=u Index: php-src/ext/mysqli/tests/002.phpt diff -u php-src/ext/mysqli/tests/002.phpt:1.12 php-src/ext/mysqli/tests/002.phpt:1.13 --- php-src/ext/mysqli/tests/002.phpt:1.12 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/002.phpt Mon Jul 6 14:36:50 2009 @@ -46,6 +46,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(11) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/003.phpt?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/mysqli/tests/003.phpt diff -u php-src/ext/mysqli/tests/003.phpt:1.13 php-src/ext/mysqli/tests/003.phpt:1.14 --- php-src/ext/mysqli/tests/003.phpt:1.13 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/003.phpt Mon Jul 6 14:36:50 2009 @@ -72,6 +72,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(7) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/004.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/mysqli/tests/004.phpt diff -u php-src/ext/mysqli/tests/004.phpt:1.11 php-src/ext/mysqli/tests/004.phpt:1.12 --- php-src/ext/mysqli/tests/004.phpt:1.11 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/004.phpt Mon Jul 6 14:36:50 2009 @@ -47,6 +47,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/005.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/mysqli/tests/005.phpt diff -u php-src/ext/mysqli/tests/005.phpt:1.10 php-src/ext/mysqli/tests/005.phpt:1.11 --- php-src/ext/mysqli/tests/005.phpt:1.10 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/005.phpt Mon Jul 6 14:36:50 2009 @@ -37,6 +37,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/006.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/mysqli/tests/006.phpt diff -u php-src/ext/mysqli/tests/006.phpt:1.8 php-src/ext/mysqli/tests/006.phpt:1.9 --- php-src/ext/mysqli/tests/006.phpt:1.8 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/006.phpt Mon Jul 6 14:36:50 2009 @@ -45,6 +45,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/007.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/mysqli/tests/007.phpt diff -u php-src/ext/mysqli/tests/007.phpt:1.8 php-src/ext/mysqli/tests/007.phpt:1.9 --- php-src/ext/mysqli/tests/007.phpt:1.8 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/007.phpt Mon Jul 6 14:36:50 2009 @@ -45,6 +45,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/008.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/mysqli/tests/008.phpt diff -u php-src/ext/mysqli/tests/008.phpt:1.8 php-src/ext/mysqli/tests/008.phpt:1.9 --- php-src/ext/mysqli/tests/008.phpt:1.8 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/008.phpt Mon Jul 6 14:36:50 2009 @@ -45,6 +45,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/009.phpt?r1=1.14&r2=1.15&diff_format=u Index: php-src/ext/mysqli/tests/009.phpt diff -u php-src/ext/mysqli/tests/009.phpt:1.14 php-src/ext/mysqli/tests/009.phpt:1.15 --- php-src/ext/mysqli/tests/009.phpt:1.14 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/009.phpt Mon Jul 6 14:36:51 2009 @@ -78,7 +78,20 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch_uint")) + printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(8) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/010.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/mysqli/tests/010.phpt diff -u php-src/ext/mysqli/tests/010.phpt:1.11 php-src/ext/mysqli/tests/010.phpt:1.12 --- php-src/ext/mysqli/tests/010.phpt:1.11 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/010.phpt Mon Jul 6 14:36:51 2009 @@ -48,6 +48,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/011.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/mysqli/tests/011.phpt diff -u php-src/ext/mysqli/tests/011.phpt:1.11 php-src/ext/mysqli/tests/011.phpt:1.12 --- php-src/ext/mysqli/tests/011.phpt:1.11 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/011.phpt Mon Jul 6 14:36:51 2009 @@ -45,6 +45,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(8) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/012.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/mysqli/tests/012.phpt diff -u php-src/ext/mysqli/tests/012.phpt:1.11 php-src/ext/mysqli/tests/012.phpt:1.12 --- php-src/ext/mysqli/tests/012.phpt:1.11 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/012.phpt Mon Jul 6 14:36:51 2009 @@ -44,6 +44,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(8) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/013.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/mysqli/tests/013.phpt diff -u php-src/ext/mysqli/tests/013.phpt:1.9 php-src/ext/mysqli/tests/013.phpt:1.10 --- php-src/ext/mysqli/tests/013.phpt:1.9 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/013.phpt Mon Jul 6 14:36:51 2009 @@ -56,6 +56,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- ok done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/014.phpt?r1=1.16&r2=1.17&diff_format=u Index: php-src/ext/mysqli/tests/014.phpt diff -u php-src/ext/mysqli/tests/014.phpt:1.16 php-src/ext/mysqli/tests/014.phpt:1.17 --- php-src/ext/mysqli/tests/014.phpt:1.16 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/014.phpt Mon Jul 6 14:36:51 2009 @@ -82,6 +82,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Num_of_rows=1 array(2) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/015.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/mysqli/tests/015.phpt diff -u php-src/ext/mysqli/tests/015.phpt:1.11 php-src/ext/mysqli/tests/015.phpt:1.12 --- php-src/ext/mysqli/tests/015.phpt:1.11 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/015.phpt Mon Jul 6 14:36:51 2009 @@ -77,6 +77,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- array(2) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/019.phpt?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/mysqli/tests/019.phpt diff -u php-src/ext/mysqli/tests/019.phpt:1.13 php-src/ext/mysqli/tests/019.phpt:1.14 --- php-src/ext/mysqli/tests/019.phpt:1.13 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/019.phpt Mon Jul 6 14:36:51 2009 @@ -55,6 +55,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS insert_read")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(11) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/020.phpt?r1=1.14&r2=1.15&diff_format=u Index: php-src/ext/mysqli/tests/020.phpt diff -u php-src/ext/mysqli/tests/020.phpt:1.14 php-src/ext/mysqli/tests/020.phpt:1.15 --- php-src/ext/mysqli/tests/020.phpt:1.14 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/020.phpt Mon Jul 6 14:36:51 2009 @@ -67,6 +67,17 @@ print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(7) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/021.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/mysqli/tests/021.phpt diff -u php-src/ext/mysqli/tests/021.phpt:1.11 php-src/ext/mysqli/tests/021.phpt:1.12 --- php-src/ext/mysqli/tests/021.phpt:1.11 Thu May 28 14:11:39 2009 +++ php-src/ext/mysqli/tests/021.phpt Mon Jul 6 14:36:51 2009 @@ -38,6 +38,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/022.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/mysqli/tests/022.phpt diff -u php-src/ext/mysqli/tests/022.phpt:1.11 php-src/ext/mysqli/tests/022.phpt:1.12 --- php-src/ext/mysqli/tests/022.phpt:1.11 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/022.phpt Mon Jul 6 14:36:51 2009 @@ -43,6 +43,17 @@ print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/023.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/mysqli/tests/023.phpt diff -u php-src/ext/mysqli/tests/023.phpt:1.10 php-src/ext/mysqli/tests/023.phpt:1.11 --- php-src/ext/mysqli/tests/023.phpt:1.10 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/023.phpt Mon Jul 6 14:36:51 2009 @@ -52,6 +52,17 @@ print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/024.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/mysqli/tests/024.phpt diff -u php-src/ext/mysqli/tests/024.phpt:1.10 php-src/ext/mysqli/tests/024.phpt:1.11 --- php-src/ext/mysqli/tests/024.phpt:1.10 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/024.phpt Mon Jul 6 14:36:51 2009 @@ -52,6 +52,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/025.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/mysqli/tests/025.phpt diff -u php-src/ext/mysqli/tests/025.phpt:1.10 php-src/ext/mysqli/tests/025.phpt:1.11 --- php-src/ext/mysqli/tests/025.phpt:1.10 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/025.phpt Mon Jul 6 14:36:51 2009 @@ -57,6 +57,17 @@ print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/026.phpt?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/mysqli/tests/026.phpt diff -u php-src/ext/mysqli/tests/026.phpt:1.13 php-src/ext/mysqli/tests/026.phpt:1.14 --- php-src/ext/mysqli/tests/026.phpt:1.13 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/026.phpt Mon Jul 6 14:36:51 2009 @@ -43,6 +43,18 @@ mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"); mysqli_close($link); print "done!"; +?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/029.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/029.phpt diff -u php-src/ext/mysqli/tests/029.phpt:1.6 php-src/ext/mysqli/tests/029.phpt:1.7 --- php-src/ext/mysqli/tests/029.phpt:1.6 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/029.phpt Mon Jul 6 14:36:51 2009 @@ -14,7 +14,7 @@ mysqli_select_db($link, $db); - mysqli_query($link, "DROP TABLE IF EXISTS exists general_test"); + mysqli_query($link, "DROP TABLE IF EXISTS general_test"); mysqli_query($link, "CREATE TABLE general_test (a INT)"); mysqli_query($link, "INSERT INTO general_test VALUES (1),(2),(3)"); @@ -22,10 +22,21 @@ var_dump($afc); - mysqli_query($link, "DROP TABLE IF EXISTS exists general_test"); + mysqli_query($link, "DROP TABLE IF EXISTS general_test"); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS general_test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- int(3) done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/032.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/mysqli/tests/032.phpt diff -u php-src/ext/mysqli/tests/032.phpt:1.9 php-src/ext/mysqli/tests/032.phpt:1.10 --- php-src/ext/mysqli/tests/032.phpt:1.9 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/032.phpt Mon Jul 6 14:36:51 2009 @@ -26,6 +26,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS general_test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- %unicode|string%(38) "Records: 3 Duplicates: 0 Warnings: 0" done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/036.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/mysqli/tests/036.phpt diff -u php-src/ext/mysqli/tests/036.phpt:1.7 php-src/ext/mysqli/tests/036.phpt:1.8 --- php-src/ext/mysqli/tests/036.phpt:1.7 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/036.phpt Mon Jul 6 14:36:51 2009 @@ -42,6 +42,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS t036")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(2) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/037.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/037.phpt diff -u php-src/ext/mysqli/tests/037.phpt:1.6 php-src/ext/mysqli/tests/037.phpt:1.7 --- php-src/ext/mysqli/tests/037.phpt:1.6 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/037.phpt Mon Jul 6 14:36:51 2009 @@ -32,6 +32,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(2) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/038.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/038.phpt diff -u php-src/ext/mysqli/tests/038.phpt:1.6 php-src/ext/mysqli/tests/038.phpt:1.7 --- php-src/ext/mysqli/tests/038.phpt:1.6 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/038.phpt Mon Jul 6 14:36:51 2009 @@ -33,5 +33,16 @@ mysqli_query($link, "DROP TABLE IF EXISTS test_result"); mysqli_close($link); ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- int(2) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/040.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/040.phpt diff -u php-src/ext/mysqli/tests/040.phpt:1.6 php-src/ext/mysqli/tests/040.phpt:1.7 --- php-src/ext/mysqli/tests/040.phpt:1.6 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/040.phpt Mon Jul 6 14:36:51 2009 @@ -31,6 +31,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- int(1) done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/041.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/mysqli/tests/041.phpt diff -u php-src/ext/mysqli/tests/041.phpt:1.7 php-src/ext/mysqli/tests/041.phpt:1.8 --- php-src/ext/mysqli/tests/041.phpt:1.7 Thu Aug 9 08:41:12 2007 +++ php-src/ext/mysqli/tests/041.phpt Mon Jul 6 14:36:51 2009 @@ -1,8 +1,8 @@ --TEST-- function test: mysqli_warning_count() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -22,6 +22,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_warnings")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- int(1) done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/042.phpt?r1=1.14&r2=1.15&diff_format=u Index: php-src/ext/mysqli/tests/042.phpt diff -u php-src/ext/mysqli/tests/042.phpt:1.14 php-src/ext/mysqli/tests/042.phpt:1.15 --- php-src/ext/mysqli/tests/042.phpt:1.14 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/042.phpt Mon Jul 6 14:36:51 2009 @@ -48,6 +48,17 @@ mysqli_close($link); print "done!" ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- object(stdClass)#%d (7) { [%u|b%"c1"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/043.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/mysqli/tests/043.phpt diff -u php-src/ext/mysqli/tests/043.phpt:1.10 php-src/ext/mysqli/tests/043.phpt:1.11 --- php-src/ext/mysqli/tests/043.phpt:1.10 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/043.phpt Mon Jul 6 14:36:51 2009 @@ -40,6 +40,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_update")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(1) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/046.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/mysqli/tests/046.phpt diff -u php-src/ext/mysqli/tests/046.phpt:1.8 php-src/ext/mysqli/tests/046.phpt:1.9 --- php-src/ext/mysqli/tests/046.phpt:1.8 Tue Jan 8 12:43:08 2008 +++ php-src/ext/mysqli/tests/046.phpt Mon Jul 6 14:36:51 2009 @@ -34,6 +34,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_affected")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- bool(true) done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/047.phpt?r1=1.16&r2=1.17&diff_format=u Index: php-src/ext/mysqli/tests/047.phpt diff -u php-src/ext/mysqli/tests/047.phpt:1.16 php-src/ext/mysqli/tests/047.phpt:1.17 --- php-src/ext/mysqli/tests/047.phpt:1.16 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/047.phpt Mon Jul 6 14:36:51 2009 @@ -45,6 +45,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_affected")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- === fetch_fields === array(2) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/048.phpt?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/mysqli/tests/048.phpt diff -u php-src/ext/mysqli/tests/048.phpt:1.11 php-src/ext/mysqli/tests/048.phpt:1.12 --- php-src/ext/mysqli/tests/048.phpt:1.11 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/048.phpt Mon Jul 6 14:36:51 2009 @@ -40,6 +40,17 @@ $mysql->close(); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(11) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/057.phpt?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/mysqli/tests/057.phpt diff -u php-src/ext/mysqli/tests/057.phpt:1.13 php-src/ext/mysqli/tests/057.phpt:1.14 --- php-src/ext/mysqli/tests/057.phpt:1.13 Fri May 29 13:02:30 2009 +++ php-src/ext/mysqli/tests/057.phpt Mon Jul 6 14:36:51 2009 @@ -62,6 +62,17 @@ mysqli_close($link); echo "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_store_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- bool(true) bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/058.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/mysqli/tests/058.phpt diff -u php-src/ext/mysqli/tests/058.phpt:1.9 php-src/ext/mysqli/tests/058.phpt:1.10 --- php-src/ext/mysqli/tests/058.phpt:1.9 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/058.phpt Mon Jul 6 14:36:51 2009 @@ -48,6 +48,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(4) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/059.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/mysqli/tests/059.phpt diff -u php-src/ext/mysqli/tests/059.phpt:1.9 php-src/ext/mysqli/tests/059.phpt:1.10 --- php-src/ext/mysqli/tests/059.phpt:1.9 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/059.phpt Mon Jul 6 14:36:51 2009 @@ -41,6 +41,17 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- %unicode|string%(6) "foobar" done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/060.phpt?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/mysqli/tests/060.phpt diff -u php-src/ext/mysqli/tests/060.phpt:1.10 php-src/ext/mysqli/tests/060.phpt:1.11 --- php-src/ext/mysqli/tests/060.phpt:1.10 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/060.phpt Mon Jul 6 14:36:51 2009 @@ -42,6 +42,17 @@ echo "Done\n"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- test_class::__construct(1,2) object(test_class)#%d (7) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/061.phpt?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/mysqli/tests/061.phpt diff -u php-src/ext/mysqli/tests/061.phpt:1.13 php-src/ext/mysqli/tests/061.phpt:1.14 --- php-src/ext/mysqli/tests/061.phpt:1.13 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/061.phpt Mon Jul 6 14:36:51 2009 @@ -49,6 +49,17 @@ unlink($filename); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS t_061")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- foo-bar %unicode|string%-%unicode|string% http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/066.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/066.phpt diff -u php-src/ext/mysqli/tests/066.phpt:1.4 php-src/ext/mysqli/tests/066.phpt:1.5 --- php-src/ext/mysqli/tests/066.phpt:1.4 Wed Jan 7 16:29:42 2009 +++ php-src/ext/mysqli/tests/066.phpt Mon Jul 6 14:36:51 2009 @@ -1,8 +1,8 @@ --TEST-- function test: mysqli_warning object --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -28,6 +28,17 @@ $mysql->close(); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_warnings")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- Warning done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/067.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/067.phpt diff -u php-src/ext/mysqli/tests/067.phpt:1.4 php-src/ext/mysqli/tests/067.phpt:1.5 --- php-src/ext/mysqli/tests/067.phpt:1.4 Thu Aug 9 08:41:12 2007 +++ php-src/ext/mysqli/tests/067.phpt Mon Jul 6 14:36:51 2009 @@ -64,5 +64,18 @@ $mysql->close(); var_dump($cnt); ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +for ($i =0; $i < 3; $i++) { + if (!mysqli_query($link, sprintf("DROP TABLE IF EXISTS cursor%d", $i))) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); +} + +mysqli_close($link); +?> --EXPECT-- int(63) \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug32405.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/bug32405.phpt diff -u php-src/ext/mysqli/tests/bug32405.phpt:1.5 php-src/ext/mysqli/tests/bug32405.phpt:1.6 --- php-src/ext/mysqli/tests/bug32405.phpt:1.5 Thu Aug 9 09:43:28 2007 +++ php-src/ext/mysqli/tests/bug32405.phpt Mon Jul 6 14:36:51 2009 @@ -1,8 +1,8 @@ --TEST-- Bug #32405 (mysqli->fetch() is returning bad data) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -13,7 +13,7 @@ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, "test"); mysqli_query($link, "SET sql_mode=''"); - + /* two fields are needed. the problem does not occur with 1 field only selected. */ $link->query("CREATE TABLE test_users(user_id int(10) unsigned NOT NULL auto_increment, login varchar(50) default '', PRIMARY KEY (user_id))"); $link->query('INSERT INTO test_users VALUES (NULL, "user1"), (NULL, "user2"), (NULL, "user3"), (NULL, "user4")'); @@ -31,6 +31,17 @@ mysqli_query($link,"DROP TABLE test_users"); mysqli_close($link); ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_users")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- int(1) %s(5) "user1" http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug34810.phpt?r1=1.12&r2=1.13&diff_format=u Index: php-src/ext/mysqli/tests/bug34810.phpt diff -u php-src/ext/mysqli/tests/bug34810.phpt:1.12 php-src/ext/mysqli/tests/bug34810.phpt:1.13 --- php-src/ext/mysqli/tests/bug34810.phpt:1.12 Fri May 29 13:02:30 2009 +++ php-src/ext/mysqli/tests/bug34810.phpt Mon Jul 6 14:36:51 2009 @@ -33,6 +33,17 @@ echo "Done\n"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_warnings")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- object(mysqli)#%d (%d) { [%u|b%"affected_rows"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug35103.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/bug35103.phpt diff -u php-src/ext/mysqli/tests/bug35103.phpt:1.4 php-src/ext/mysqli/tests/bug35103.phpt:1.5 --- php-src/ext/mysqli/tests/bug35103.phpt:1.4 Thu Aug 9 09:43:28 2007 +++ php-src/ext/mysqli/tests/bug35103.phpt Mon Jul 6 14:36:51 2009 @@ -1,8 +1,8 @@ --TEST-- Bug #35103 (Bad handling of unsigned bigint) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -22,7 +22,7 @@ $mysql->query("DROP TABLE IF EXISTS test_buint"); $mysql->query("CREATE TABLE test_buint (a bigint(20) unsigned default NULL)"); $mysql->query("INSERT INTO test_buint VALUES (18446744073709551615),(9223372036854775807),(9223372036854775808),(2147483647),(2147483649),(4294967295)"); - + $stmt = $mysql->prepare("SELECT a FROM test_bint ORDER BY a"); $stmt->bind_result($v); $stmt->execute(); @@ -51,6 +51,17 @@ $mysql->close(); ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bint") || !mysqli_query($link, "DROP TABLE IF EXISTS test_buint")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- BIG INT SIGNED, TEST -9223372036854775808 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug35517.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/mysqli/tests/bug35517.phpt diff -u php-src/ext/mysqli/tests/bug35517.phpt:1.7 php-src/ext/mysqli/tests/bug35517.phpt:1.8 --- php-src/ext/mysqli/tests/bug35517.phpt:1.7 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/bug35517.phpt Mon Jul 6 14:36:51 2009 @@ -37,6 +37,17 @@ $mysql->close(); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS temp")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- 3000000897 3800001532 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug35759.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/bug35759.phpt diff -u php-src/ext/mysqli/tests/bug35759.phpt:1.5 php-src/ext/mysqli/tests/bug35759.phpt:1.6 --- php-src/ext/mysqli/tests/bug35759.phpt:1.5 Mon Feb 4 17:32:43 2008 +++ php-src/ext/mysqli/tests/bug35759.phpt Mon Jul 6 14:36:51 2009 @@ -1,8 +1,8 @@ --TEST-- Bug #35759 (mysqli_stmt_bind_result() makes huge allocation when column empty) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -24,11 +24,11 @@ while (++$i < $col_num) { $create .= ", a$i MEDIUMBLOB NOT NULL DEFAULT ''"; } - $create .= ")"; - + $create .= ")"; + $mysql->query($create); $mysql->query("INSERT INTO blobby (a0) VALUES ('')"); - + $stmt = $mysql->prepare("SELECT * FROM blobby"); $stmt->execute(); $stmt->store_result(); @@ -37,7 +37,7 @@ } call_user_func_array(array($stmt, "bind_result"), $params); $stmt->fetch(); - + $stmt->close(); $mysql->query("DROP TABLE blobby"); @@ -45,5 +45,16 @@ $mysql->close(); echo "OK\n"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS blobby")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- OK http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug36745.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/bug36745.phpt diff -u php-src/ext/mysqli/tests/bug36745.phpt:1.6 php-src/ext/mysqli/tests/bug36745.phpt:1.7 --- php-src/ext/mysqli/tests/bug36745.phpt:1.6 Thu Aug 9 09:43:28 2007 +++ php-src/ext/mysqli/tests/bug36745.phpt Mon Jul 6 14:36:51 2009 @@ -1,8 +1,8 @@ --TEST-- Bug #36745 (LOAD DATA LOCAL INFILE doesn't return correct error message) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -21,6 +21,17 @@ $mysql->close(); printf("Done"); ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS litest")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- %s(%d) "%s" Done http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug36949.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/bug36949.phpt diff -u php-src/ext/mysqli/tests/bug36949.phpt:1.4 php-src/ext/mysqli/tests/bug36949.phpt:1.5 --- php-src/ext/mysqli/tests/bug36949.phpt:1.4 Thu Aug 9 09:43:28 2007 +++ php-src/ext/mysqli/tests/bug36949.phpt Mon Jul 6 14:36:51 2009 @@ -1,8 +1,8 @@ --TEST-- Bug #36949 (invalid internal mysqli objects dtor) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -47,6 +47,17 @@ $A = new A(); $B = new B(); ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS my_time")) + printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- %d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d<br> %d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d<br> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug37090.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/bug37090.phpt diff -u php-src/ext/mysqli/tests/bug37090.phpt:1.5 php-src/ext/mysqli/tests/bug37090.phpt:1.6 --- php-src/ext/mysqli/tests/bug37090.phpt:1.5 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/bug37090.phpt Mon Jul 6 14:36:51 2009 @@ -7,7 +7,7 @@ if (!function_exists('mysqli_set_charset')) { die('skip mysqli_set_charset() not available'); } -if (ini_get('unicode.semantics')) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) { die("skip Functionality not available in unicode mode"); } ?> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug42378.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/bug42378.phpt diff -u php-src/ext/mysqli/tests/bug42378.phpt:1.3 php-src/ext/mysqli/tests/bug42378.phpt:1.4 --- php-src/ext/mysqli/tests/bug42378.phpt:1.3 Tue Oct 30 12:06:28 2007 +++ php-src/ext/mysqli/tests/bug42378.phpt Mon Jul 6 14:36:51 2009 @@ -181,6 +181,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- FLOAT FORMAT(col1, 0) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug42548.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/bug42548.phpt diff -u php-src/ext/mysqli/tests/bug42548.phpt:1.2 php-src/ext/mysqli/tests/bug42548.phpt:1.3 --- php-src/ext/mysqli/tests/bug42548.phpt:1.2 Fri Dec 28 14:51:26 2007 +++ php-src/ext/mysqli/tests/bug42548.phpt Mon Jul 6 14:36:51 2009 @@ -50,6 +50,16 @@ $mysqli->close(); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +mysqli_query($link, "DROP PROCEDURE IF EXISTS p1"); + +mysqli_close($link); +?> --EXPECT-- Array ( http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug44897.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/bug44897.phpt diff -u php-src/ext/mysqli/tests/bug44897.phpt:1.2 php-src/ext/mysqli/tests/bug44897.phpt:1.3 --- php-src/ext/mysqli/tests/bug44897.phpt:1.2 Fri May 29 13:12:24 2009 +++ php-src/ext/mysqli/tests/bug44897.phpt Mon Jul 6 14:36:51 2009 @@ -72,5 +72,19 @@ print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_query($link, "DROP PROCEDURE IF EXISTS p"); + +mysqli_close($link); +?> + --EXPECTF-- done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug45289.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/bug45289.phpt diff -u php-src/ext/mysqli/tests/bug45289.phpt:1.2 php-src/ext/mysqli/tests/bug45289.phpt:1.3 --- php-src/ext/mysqli/tests/bug45289.phpt:1.2 Fri May 29 08:58:10 2009 +++ php-src/ext/mysqli/tests/bug45289.phpt Mon Jul 6 14:36:51 2009 @@ -25,6 +25,10 @@ var_dump($res->fetch_assoc()); ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [003] [0%s http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_affected_rows.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_affected_rows.phpt diff -u php-src/ext/mysqli/tests/mysqli_affected_rows.phpt:1.5 php-src/ext/mysqli/tests/mysqli_affected_rows.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_affected_rows.phpt:1.5 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_affected_rows.phpt Mon Jul 6 14:36:51 2009 @@ -127,5 +127,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_affected_rows_oo.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_affected_rows_oo.phpt diff -u php-src/ext/mysqli/tests/mysqli_affected_rows_oo.phpt:1.6 php-src/ext/mysqli/tests/mysqli_affected_rows_oo.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_affected_rows_oo.phpt:1.6 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_affected_rows_oo.phpt Mon Jul 6 14:36:51 2009 @@ -106,5 +106,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_autocommit.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_autocommit.phpt diff -u php-src/ext/mysqli/tests/mysqli_autocommit.phpt:1.5 php-src/ext/mysqli/tests/mysqli_autocommit.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_autocommit.phpt:1.5 Tue Nov 18 16:54:38 2008 +++ php-src/ext/mysqli/tests/mysqli_autocommit.phpt Mon Jul 6 14:36:51 2009 @@ -148,5 +148,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_autocommit_oo.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_autocommit_oo.phpt diff -u php-src/ext/mysqli/tests/mysqli_autocommit_oo.phpt:1.4 php-src/ext/mysqli/tests/mysqli_autocommit_oo.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_autocommit_oo.phpt:1.4 Wed Oct 10 10:49:00 2007 +++ php-src/ext/mysqli/tests/mysqli_autocommit_oo.phpt Mon Jul 6 14:36:51 2009 @@ -140,5 +140,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_change_user_get_lock.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_change_user_get_lock.phpt diff -u php-src/ext/mysqli/tests/mysqli_change_user_get_lock.phpt:1.2 php-src/ext/mysqli/tests/mysqli_change_user_get_lock.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_change_user_get_lock.phpt:1.2 Wed Oct 10 10:43:39 2007 +++ php-src/ext/mysqli/tests/mysqli_change_user_get_lock.phpt Mon Jul 6 14:36:51 2009 @@ -93,6 +93,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Testing GET_LOCK()... ... lock 'phptest_%d' acquired by thread %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_change_user_insert_id.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_change_user_insert_id.phpt diff -u php-src/ext/mysqli/tests/mysqli_change_user_insert_id.phpt:1.7 php-src/ext/mysqli/tests/mysqli_change_user_insert_id.phpt:1.8 --- php-src/ext/mysqli/tests/mysqli_change_user_insert_id.phpt:1.7 Fri May 29 10:15:32 2009 +++ php-src/ext/mysqli/tests/mysqli_change_user_insert_id.phpt Mon Jul 6 14:36:51 2009 @@ -62,5 +62,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt diff -u php-src/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt:1.2 php-src/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt:1.2 Wed Oct 10 10:43:39 2007 +++ php-src/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt Mon Jul 6 14:36:51 2009 @@ -99,5 +99,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_change_user_rollback.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_change_user_rollback.phpt diff -u php-src/ext/mysqli/tests/mysqli_change_user_rollback.phpt:1.2 php-src/ext/mysqli/tests/mysqli_change_user_rollback.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_change_user_rollback.phpt:1.2 Wed Oct 10 10:43:39 2007 +++ php-src/ext/mysqli/tests/mysqli_change_user_rollback.phpt Mon Jul 6 14:36:51 2009 @@ -66,5 +66,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_character_set.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_character_set.phpt diff -u php-src/ext/mysqli/tests/mysqli_character_set.phpt:1.4 php-src/ext/mysqli/tests/mysqli_character_set.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_character_set.phpt:1.4 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_character_set.phpt Mon Jul 6 14:36:51 2009 @@ -100,5 +100,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt diff -u php-src/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt:1.2 php-src/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt Mon Jul 6 14:36:51 2009 @@ -89,6 +89,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: Wrong parameter count for mysqli_warning::mysqli_warning() in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_commit.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_commit.phpt diff -u php-src/ext/mysqli/tests/mysqli_commit.phpt:1.2 php-src/ext/mysqli/tests/mysqli_commit.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_commit.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_commit.phpt Mon Jul 6 14:36:51 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_commit() --SKIPIF-- -<?php -require_once('skipif.inc'); -require_once('skipifemb.inc'); +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { @@ -79,5 +79,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_commit_oo.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_commit_oo.phpt diff -u php-src/ext/mysqli/tests/mysqli_commit_oo.phpt:1.2 php-src/ext/mysqli/tests/mysqli_commit_oo.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_commit_oo.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_commit_oo.phpt Mon Jul 6 14:36:51 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_commit() --SKIPIF-- -<?php -require_once('skipif.inc'); -require_once('skipifemb.inc'); +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) { die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", @@ -80,5 +80,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_data_seek.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_data_seek.phpt diff -u php-src/ext/mysqli/tests/mysqli_data_seek.phpt:1.2 php-src/ext/mysqli/tests/mysqli_data_seek.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_data_seek.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_data_seek.phpt Mon Jul 6 14:36:51 2009 @@ -63,6 +63,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_data_seek(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_data_seek_oo.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_data_seek_oo.phpt diff -u php-src/ext/mysqli/tests/mysqli_data_seek_oo.phpt:1.2 php-src/ext/mysqli/tests/mysqli_data_seek_oo.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_data_seek_oo.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_data_seek_oo.phpt Mon Jul 6 14:36:51 2009 @@ -72,6 +72,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_result::data_seek(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_debug.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_debug.phpt diff -u php-src/ext/mysqli/tests/mysqli_debug.phpt:1.6 php-src/ext/mysqli/tests/mysqli_debug.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_debug.phpt:1.6 Tue Aug 26 10:59:03 2008 +++ php-src/ext/mysqli/tests/mysqli_debug.phpt Mon Jul 6 14:36:51 2009 @@ -61,5 +61,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done%s http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_debug_append.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_debug_append.phpt diff -u php-src/ext/mysqli/tests/mysqli_debug_append.phpt:1.5 php-src/ext/mysqli/tests/mysqli_debug_append.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_debug_append.phpt:1.5 Tue Aug 26 10:59:03 2008 +++ php-src/ext/mysqli/tests/mysqli_debug_append.phpt Mon Jul 6 14:36:51 2009 @@ -82,5 +82,9 @@ if ($IS_MYSQLND) print "libmysql/DBUG package prints some debug info here." ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done%s http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt diff -u php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt:1.5 php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt:1.5 Tue Aug 26 10:59:03 2008 +++ php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt Mon Jul 6 14:36:51 2009 @@ -218,6 +218,10 @@ print "libmysql/DBUG package prints some debug info here."; @unlink($trace_file); ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [083][control string 'n:O,/tmp/mysqli_debug_phpt.trace'] Trace file has not been written. done%s http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt diff -u php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt:1.5 php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt:1.5 Tue Aug 26 10:59:03 2008 +++ php-src/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt Mon Jul 6 14:36:51 2009 @@ -120,5 +120,9 @@ @unlink($trace_file); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- -done! +done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt diff -u php-src/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt:1.2 php-src/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt Mon Jul 6 14:36:51 2009 @@ -38,6 +38,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_disable_reads_from_master(): Couldn't fetch mysqli in %s on line %d done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_errno.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_errno.phpt diff -u php-src/ext/mysqli/tests/mysqli_errno.phpt:1.2 php-src/ext/mysqli/tests/mysqli_errno.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_errno.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_errno.phpt Mon Jul 6 14:36:51 2009 @@ -1,8 +1,8 @@ --TEST-- mysqli_errno() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_errno_oo.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_errno_oo.phpt diff -u php-src/ext/mysqli/tests/mysqli_errno_oo.phpt:1.2 php-src/ext/mysqli/tests/mysqli_errno_oo.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_errno_oo.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_errno_oo.phpt Mon Jul 6 14:36:51 2009 @@ -1,8 +1,8 @@ --TEST-- $mysqli->errno --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_explain_metadata.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_explain_metadata.phpt diff -u php-src/ext/mysqli/tests/mysqli_explain_metadata.phpt:1.2 php-src/ext/mysqli/tests/mysqli_explain_metadata.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_explain_metadata.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_explain_metadata.phpt Mon Jul 6 14:36:51 2009 @@ -151,5 +151,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_all.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_all.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_all.phpt:1.6 php-src/ext/mysqli/tests/mysqli_fetch_all.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_fetch_all.phpt:1.6 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_all.phpt Mon Jul 6 14:36:51 2009 @@ -297,6 +297,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [005] array(2) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_all_oo.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_all_oo.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_all_oo.phpt:1.6 php-src/ext/mysqli/tests/mysqli_fetch_all_oo.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_fetch_all_oo.phpt:1.6 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_all_oo.phpt Mon Jul 6 14:36:51 2009 @@ -300,6 +300,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [005] array(2) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt:1.4 php-src/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt:1.4 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt Mon Jul 6 14:36:51 2009 @@ -28,6 +28,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [002] array(2) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt:1.2 php-src/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt Mon Jul 6 14:36:51 2009 @@ -108,5 +108,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_array_oo.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_array_oo.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_array_oo.phpt:1.5 php-src/ext/mysqli/tests/mysqli_fetch_array_oo.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_fetch_array_oo.phpt:1.5 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_array_oo.phpt Mon Jul 6 14:36:51 2009 @@ -273,6 +273,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [005] array(4) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_assoc.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_assoc.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_assoc.phpt:1.5 php-src/ext/mysqli/tests/mysqli_fetch_assoc.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_fetch_assoc.phpt:1.5 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_assoc.phpt Mon Jul 6 14:36:51 2009 @@ -67,6 +67,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [005] array(2) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt:1.2 php-src/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt Mon Jul 6 14:36:51 2009 @@ -109,5 +109,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt:1.4 php-src/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt:1.4 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt Mon Jul 6 14:36:51 2009 @@ -54,6 +54,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [005] array(2) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt:1.1 php-src/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt:1.2 --- php-src/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt:1.1 Fri Jan 4 18:17:13 2008 +++ php-src/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt Mon Jul 6 14:36:51 2009 @@ -70,5 +70,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_field.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_field.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_field.phpt:1.5 php-src/ext/mysqli/tests/mysqli_fetch_field.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_fetch_field.phpt:1.5 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_field.phpt Mon Jul 6 14:36:51 2009 @@ -56,6 +56,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- object(stdClass)#%d (11) { [%u|b%"name"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_field_direct.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_field_direct.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_field_direct.phpt:1.4 php-src/ext/mysqli/tests/mysqli_fetch_field_direct.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_fetch_field_direct.phpt:1.4 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_field_direct.phpt Mon Jul 6 14:36:51 2009 @@ -40,6 +40,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_fetch_field_direct(): Field offset is invalid for resultset in %s on line %d bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt:1.4 php-src/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt:1.4 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt Mon Jul 6 14:36:51 2009 @@ -49,6 +49,10 @@ $mysqli->close(); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_result::fetch_field_direct(): Field offset is invalid for resultset in %s on line %d bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_field_flags.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_field_flags.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_field_flags.phpt:1.5 php-src/ext/mysqli/tests/mysqli_fetch_field_flags.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_fetch_field_flags.phpt:1.5 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_field_flags.phpt Mon Jul 6 14:36:51 2009 @@ -229,5 +229,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_field_oo.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_field_oo.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_field_oo.phpt:1.5 php-src/ext/mysqli/tests/mysqli_fetch_field_oo.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_fetch_field_oo.phpt:1.5 Thu May 28 17:49:00 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_field_oo.phpt Mon Jul 6 14:36:51 2009 @@ -44,6 +44,10 @@ $mysqli->close(); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- object(stdClass)#%d (11) { [%u|b%"name"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_field_types.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_field_types.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_field_types.phpt:1.5 php-src/ext/mysqli/tests/mysqli_fetch_field_types.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_fetch_field_types.phpt:1.5 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_field_types.phpt Mon Jul 6 14:36:51 2009 @@ -115,5 +115,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_fields.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_fields.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_fields.phpt:1.4 php-src/ext/mysqli/tests/mysqli_fetch_fields.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_fetch_fields.phpt:1.4 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_fields.phpt Mon Jul 6 14:36:51 2009 @@ -37,6 +37,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- object(stdClass)#%d (11) { [%u|b%"name"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_lengths.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_lengths.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_lengths.phpt:1.2 php-src/ext/mysqli/tests/mysqli_fetch_lengths.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_fetch_lengths.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_fetch_lengths.phpt Mon Jul 6 14:36:51 2009 @@ -36,6 +36,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- bool(false) array(2) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt:1.3 php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt:1.3 Mon Jan 12 12:54:17 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt Mon Jul 6 14:36:51 2009 @@ -28,6 +28,13 @@ $mysqli->close(); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- NULL array(2) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_object.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_object.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_object.phpt:1.3 php-src/ext/mysqli/tests/mysqli_fetch_object.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_fetch_object.phpt:1.3 Wed Oct 10 10:49:00 2007 +++ php-src/ext/mysqli/tests/mysqli_fetch_object.phpt Mon Jul 6 14:36:51 2009 @@ -131,6 +131,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: Missing argument 1 for mysqli_fetch_object_construct::__construct() in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt:1.4 php-src/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt:1.4 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt Mon Jul 6 14:36:51 2009 @@ -44,6 +44,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- No exception with PHP: object(mysqli_fetch_object_test)#%d (%d) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt:1.2 php-src/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt Mon Jul 6 14:36:51 2009 @@ -19,6 +19,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- %s(6) "object" done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_object_oo.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_object_oo.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_object_oo.phpt:1.2 php-src/ext/mysqli/tests/mysqli_fetch_object_oo.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_fetch_object_oo.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_fetch_object_oo.phpt Mon Jul 6 14:36:51 2009 @@ -105,6 +105,10 @@ $mysqli->close(); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: Missing argument 1 for mysqli_fetch_object_construct::__construct() in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_row.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fetch_row.phpt diff -u php-src/ext/mysqli/tests/mysqli_fetch_row.phpt:1.4 php-src/ext/mysqli/tests/mysqli_fetch_row.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_fetch_row.phpt:1.4 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fetch_row.phpt Mon Jul 6 14:36:51 2009 @@ -37,6 +37,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [004] array(3) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_field_count.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_field_count.phpt diff -u php-src/ext/mysqli/tests/mysqli_field_count.phpt:1.5 php-src/ext/mysqli/tests/mysqli_field_count.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_field_count.phpt:1.5 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_field_count.phpt Mon Jul 6 14:36:51 2009 @@ -47,6 +47,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- int(0) int(2) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_field_seek.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_field_seek.phpt diff -u php-src/ext/mysqli/tests/mysqli_field_seek.phpt:1.4 php-src/ext/mysqli/tests/mysqli_field_seek.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_field_seek.phpt:1.4 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_field_seek.phpt Mon Jul 6 14:36:51 2009 @@ -101,6 +101,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_field_seek(): Invalid field offset in %s on line %d bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_field_tell.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_field_tell.phpt diff -u php-src/ext/mysqli/tests/mysqli_field_tell.phpt:1.4 php-src/ext/mysqli/tests/mysqli_field_tell.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_field_tell.phpt:1.4 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_field_tell.phpt Mon Jul 6 14:36:51 2009 @@ -54,6 +54,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- int(0) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fork.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_fork.phpt diff -u php-src/ext/mysqli/tests/mysqli_fork.phpt:1.4 php-src/ext/mysqli/tests/mysqli_fork.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_fork.phpt:1.4 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_fork.phpt Mon Jul 6 14:36:51 2009 @@ -234,6 +234,20 @@ print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS messages")) + printf("[c003] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(1) { ["message"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_free_result.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_free_result.phpt diff -u php-src/ext/mysqli/tests/mysqli_free_result.phpt:1.2 php-src/ext/mysqli/tests/mysqli_free_result.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_free_result.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_free_result.phpt Mon Jul 6 14:36:51 2009 @@ -51,6 +51,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- a NULL http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt diff -u php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt:1.5 php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt:1.5 Wed Jul 1 12:51:40 2009 +++ php-src/ext/mysqli/tests/mysqli_get_cache_stats.phpt Mon Jul 6 14:36:51 2009 @@ -92,6 +92,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- array(7) { [%u|b%"put_hits"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt diff -u php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt:1.4 php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt:1.4 Wed Jul 1 12:51:40 2009 +++ php-src/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt Mon Jul 6 14:36:51 2009 @@ -91,5 +91,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt diff -u php-src/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt:1.1 php-src/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt:1.2 --- php-src/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt:1.1 Wed Jul 1 12:51:40 2009 +++ php-src/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt Mon Jul 6 14:36:51 2009 @@ -51,5 +51,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_charset.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_get_charset.phpt diff -u php-src/ext/mysqli/tests/mysqli_get_charset.phpt:1.6 php-src/ext/mysqli/tests/mysqli_get_charset.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_get_charset.phpt:1.6 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_get_charset.phpt Mon Jul 6 14:36:51 2009 @@ -106,6 +106,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_get_charset(): Couldn't fetch mysqli in %s on line %d done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt?r1=1.8&r2=1.9&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.8 php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.9 --- php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt:1.8 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_get_client_stats.phpt Mon Jul 6 14:36:52 2009 @@ -858,6 +858,32 @@ print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS non_result_set_queries_test")) + printf("[c003] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS client_stats_test")) + printf("[c004] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP DATABASE IF EXISTS mysqli_get_client_stats_")) + printf("[c005] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP DATABASE IF EXISTS mysqli_get_client_stats")) + printf("[c006] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP SERVER IF EXISTS myself")) + printf("[c007] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(119) { [%u|b%"bytes_sent"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt:1.2 php-src/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt:1.2 Wed Oct 10 10:46:06 2007 +++ php-src/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt Mon Jul 6 14:36:52 2009 @@ -36,6 +36,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- BEGINNING: implicit_free_result = %d END: implicit_free_result = %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt:1.3 php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt:1.3 Wed Jul 1 12:51:40 2009 +++ php-src/ext/mysqli/tests/mysqli_get_client_stats_off.phpt Mon Jul 6 14:36:52 2009 @@ -40,5 +40,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt diff -u php-src/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt:1.2 php-src/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt:1.2 Wed Oct 10 10:46:06 2007 +++ php-src/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt Mon Jul 6 14:36:52 2009 @@ -89,6 +89,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- BEGINNING: rows_fetched_from_client_ps_unbuffered = %d BEGINNING: rows_fetched_from_client_ps_buffered = %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_connection_stats.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_get_connection_stats.phpt diff -u php-src/ext/mysqli/tests/mysqli_get_connection_stats.phpt:1.4 php-src/ext/mysqli/tests/mysqli_get_connection_stats.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_get_connection_stats.phpt:1.4 Wed Jul 1 12:51:40 2009 +++ php-src/ext/mysqli/tests/mysqli_get_connection_stats.phpt Mon Jul 6 14:36:52 2009 @@ -65,5 +65,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_host_info.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_get_host_info.phpt diff -u php-src/ext/mysqli/tests/mysqli_get_host_info.phpt:1.2 php-src/ext/mysqli/tests/mysqli_get_host_info.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_get_host_info.phpt:1.2 Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_get_host_info.phpt Mon Jul 6 14:36:52 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_get_host_info() --SKIPIF-- -<?php -require_once('skipif.inc'); -require_once('skipifemb.inc'); +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -22,5 +22,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_server_info.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_get_server_info.phpt diff -u php-src/ext/mysqli/tests/mysqli_get_server_info.phpt:1.2 php-src/ext/mysqli/tests/mysqli_get_server_info.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_get_server_info.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_get_server_info.phpt Mon Jul 6 14:36:52 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_get_server_info() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -25,5 +25,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_get_warnings.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_get_warnings.phpt diff -u php-src/ext/mysqli/tests/mysqli_get_warnings.phpt:1.2 php-src/ext/mysqli/tests/mysqli_get_warnings.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_get_warnings.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_get_warnings.phpt Mon Jul 6 14:36:52 2009 @@ -143,5 +143,18 @@ print "done!"; ?> +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS t1")) + printf("[c003] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_info.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_info.phpt diff -u php-src/ext/mysqli/tests/mysqli_info.phpt:1.5 php-src/ext/mysqli/tests/mysqli_info.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_info.phpt:1.5 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_info.phpt Mon Jul 6 14:36:52 2009 @@ -93,5 +93,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_insert_id.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_insert_id.phpt diff -u php-src/ext/mysqli/tests/mysqli_insert_id.phpt:1.3 php-src/ext/mysqli/tests/mysqli_insert_id.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_insert_id.phpt:1.3 Fri Jan 4 18:17:13 2008 +++ php-src/ext/mysqli/tests/mysqli_insert_id.phpt Mon Jul 6 14:36:52 2009 @@ -130,6 +130,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_insert_id(): Couldn't fetch mysqli in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_insert_id_variation.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_insert_id_variation.phpt diff -u php-src/ext/mysqli/tests/mysqli_insert_id_variation.phpt:1.1 php-src/ext/mysqli/tests/mysqli_insert_id_variation.phpt:1.2 --- php-src/ext/mysqli/tests/mysqli_insert_id_variation.phpt:1.1 Mon Oct 27 17:20:26 2008 +++ php-src/ext/mysqli/tests/mysqli_insert_id_variation.phpt Mon Jul 6 14:36:52 2009 @@ -87,6 +87,17 @@ $link->query("DROP TABLE IF EXISTS test_insert_id_var"); echo "DONE"; ---EXPECTF-- -DONE +?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_insert_id_var")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); +mysqli_close($link); +?> +--EXPECTF-- +DONE \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_kill.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_kill.phpt diff -u php-src/ext/mysqli/tests/mysqli_kill.phpt:1.6 php-src/ext/mysqli/tests/mysqli_kill.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_kill.phpt:1.6 Fri May 29 11:00:53 2009 +++ php-src/ext/mysqli/tests/mysqli_kill.phpt Mon Jul 6 14:36:52 2009 @@ -73,6 +73,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_kill(): processid should have positive value in %s on line %d %unicode|string%(%d) "%s" http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_max_links.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_max_links.phpt diff -u php-src/ext/mysqli/tests/mysqli_max_links.phpt:1.3 php-src/ext/mysqli/tests/mysqli_max_links.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_max_links.phpt:1.3 Sat May 24 15:13:09 2008 +++ php-src/ext/mysqli/tests/mysqli_max_links.phpt Mon Jul 6 14:36:52 2009 @@ -36,6 +36,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- bool(true) int(1) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_more_results.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_more_results.phpt diff -u php-src/ext/mysqli/tests/mysqli_more_results.phpt:1.2 php-src/ext/mysqli/tests/mysqli_more_results.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_more_results.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_more_results.phpt Mon Jul 6 14:36:52 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_more_results() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -95,6 +95,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [004] bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_multi_query.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_multi_query.phpt diff -u php-src/ext/mysqli/tests/mysqli_multi_query.phpt:1.2 php-src/ext/mysqli/tests/mysqli_multi_query.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_multi_query.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_multi_query.phpt Mon Jul 6 14:36:52 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_multi_query() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -146,6 +146,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [006] 3 [008] 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_mysqli_result_invalid_mode.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_mysqli_result_invalid_mode.phpt diff -u php-src/ext/mysqli/tests/mysqli_mysqli_result_invalid_mode.phpt:1.3 php-src/ext/mysqli/tests/mysqli_mysqli_result_invalid_mode.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_mysqli_result_invalid_mode.phpt:1.3 Wed Jan 7 16:29:42 2009 +++ php-src/ext/mysqli/tests/mysqli_mysqli_result_invalid_mode.phpt Mon Jul 6 14:36:52 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_result(), invalid mode --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -21,6 +21,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_result::__construct(): Invalid value for resultmode in %s on line %d done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_next_result.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_next_result.phpt diff -u php-src/ext/mysqli/tests/mysqli_next_result.phpt:1.2 php-src/ext/mysqli/tests/mysqli_next_result.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_next_result.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_next_result.phpt Mon Jul 6 14:36:52 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_next_result() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -114,6 +114,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_next_result(): Couldn't fetch mysqli in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_num_fields.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_num_fields.phpt diff -u php-src/ext/mysqli/tests/mysqli_num_fields.phpt:1.2 php-src/ext/mysqli/tests/mysqli_num_fields.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_num_fields.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_num_fields.phpt Mon Jul 6 14:36:52 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_num_fields() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -48,6 +48,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_num_fields(): Couldn't fetch mysqli_result in %s on line %d done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_num_rows.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_num_rows.phpt diff -u php-src/ext/mysqli/tests/mysqli_num_rows.phpt:1.2 php-src/ext/mysqli/tests/mysqli_num_rows.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_num_rows.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_num_rows.phpt Mon Jul 6 14:36:52 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_num_rows() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -73,6 +73,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_pconn_kill.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_pconn_kill.phpt diff -u php-src/ext/mysqli/tests/mysqli_pconn_kill.phpt:1.5 php-src/ext/mysqli/tests/mysqli_pconn_kill.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_pconn_kill.phpt:1.5 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_pconn_kill.phpt Mon Jul 6 14:36:52 2009 @@ -89,5 +89,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_pconn_limits.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_pconn_limits.phpt diff -u php-src/ext/mysqli/tests/mysqli_pconn_limits.phpt:1.6 php-src/ext/mysqli/tests/mysqli_pconn_limits.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_pconn_limits.phpt:1.6 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_pconn_limits.phpt Mon Jul 6 14:36:52 2009 @@ -88,6 +88,10 @@ mysqli_close($plink3); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Regular connection 1 - 'works..' Regular connection 2 - 'works...' http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_pconn_max_links.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_pconn_max_links.phpt diff -u php-src/ext/mysqli/tests/mysqli_pconn_max_links.phpt:1.4 php-src/ext/mysqli/tests/mysqli_pconn_max_links.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_pconn_max_links.phpt:1.4 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_pconn_max_links.phpt Mon Jul 6 14:36:52 2009 @@ -15,9 +15,10 @@ die(sprintf("skip Cannot connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error())); mysqli_query($link, 'DROP USER pcontest'); - mysqli_query($link, 'DROP USER pcontest@localhost'); + mysqli_query($link, 'DROP USER pcontest@localhost'); + if (!mysqli_query($link, 'CREATE USER pcontest@"%" IDENTIFIED BY "pcontest"') || - !mysqli_query($link, 'CREATE USER pcontest@localhost IDENTIFIED BY "pcontest"')) { + !mysqli_query($link, 'CREATE USER pcontest@localhost IDENTIFIED BY "pcontest"')) { printf("skip Cannot create second DB user [%d] %s", mysqli_errno($link), mysqli_error($link)); mysqli_close($link); die("skip CREATE USER failed"); @@ -25,21 +26,20 @@ // we might be able to specify the host using CURRENT_USER(), but... if (!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'%%'", $db)) || - !mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'localhost'", $db))) { + !mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'localhost'", $db))) { printf("skip Cannot GRANT SELECT to second DB user [%d] %s", mysqli_errno($link), mysqli_error($link)); mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest'); - mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); - mysqli_query($link, 'DROP USER pcontest@localhost'); + mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); + mysqli_query($link, 'DROP USER pcontest@localhost'); mysqli_query($link, 'DROP USER pcontest'); mysqli_close($link); die("skip GRANT failed"); } - if (!($link_pcontest = @mysqli_connect($host, 'pcontest', 'pcontest', $db, $port, $socket))) { - die(":)"); - mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest'); - mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); - mysqli_query($link, 'DROP USER pcontest@localhost'); + if (!($link_pcontest = @mysqli_connect($host, 'pcontest', 'pcontest', $db, $port, $socket))) { + mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest'); + mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); + mysqli_query($link, 'DROP USER pcontest@localhost'); mysqli_query($link, 'DROP USER pcontest'); mysqli_close($link); die("skip CONNECT using new user failed"); @@ -158,6 +158,22 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest'); +mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); +mysqli_query($link, 'DROP USER pcontest@localhost'); +mysqli_query($link, 'DROP USER pcontest'); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [%u|b%"id"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt diff -u php-src/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt:1.4 php-src/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt:1.4 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt Mon Jul 6 14:36:52 2009 @@ -153,6 +153,23 @@ print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS bogus")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_query($link, "DROP PROCEDURE IF EXISTS p"); + +mysqli_close($link); +?> + --EXPECTF-- [003] 'SELECT' caused 1064 [003] 'UPDATE test SET id = 101 WHERE id > 3' caused 1062 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_prepare.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_prepare.phpt diff -u php-src/ext/mysqli/tests/mysqli_prepare.phpt:1.5 php-src/ext/mysqli/tests/mysqli_prepare.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_prepare.phpt:1.5 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_prepare.phpt Mon Jul 6 14:36:52 2009 @@ -116,6 +116,20 @@ print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test2")) + printf("[c003] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- bool(false) done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_prepare_no_object.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_prepare_no_object.phpt diff -u php-src/ext/mysqli/tests/mysqli_prepare_no_object.phpt:1.2 php-src/ext/mysqli/tests/mysqli_prepare_no_object.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_prepare_no_object.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_prepare_no_object.phpt Mon Jul 6 14:36:52 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_prepare() - no object on failure --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -35,6 +35,10 @@ print "done!"; ?> +--CLEAN-- +<?php +require_once("clean_table.inc"); +?> --EXPECTF-- a) [1065] Query was empty b) [1065] Query was empty http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_query.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_query.phpt diff -u php-src/ext/mysqli/tests/mysqli_query.phpt:1.6 php-src/ext/mysqli/tests/mysqli_query.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_query.phpt:1.6 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_query.phpt Mon Jul 6 14:36:52 2009 @@ -112,6 +112,20 @@ print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +@mysqli_query($link, "DROP FUNCTION IF EXISTS f"); +@mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'); + +mysqli_close($link); +?> --EXPECTF-- array(1) { [%u|b%"valid"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_query_local_infile_large.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_query_local_infile_large.phpt diff -u php-src/ext/mysqli/tests/mysqli_query_local_infile_large.phpt:1.1 php-src/ext/mysqli/tests/mysqli_query_local_infile_large.phpt:1.2 --- php-src/ext/mysqli/tests/mysqli_query_local_infile_large.phpt:1.1 Fri Jul 3 12:13:57 2009 +++ php-src/ext/mysqli/tests/mysqli_query_local_infile_large.phpt Mon Jul 6 14:36:52 2009 @@ -71,7 +71,7 @@ printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) - printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + printf("[c002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); ?> --EXPECTF-- Filesize in bytes: %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_query_stored_proc.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_query_stored_proc.phpt diff -u php-src/ext/mysqli/tests/mysqli_query_stored_proc.phpt:1.6 php-src/ext/mysqli/tests/mysqli_query_stored_proc.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_query_stored_proc.phpt:1.6 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_query_stored_proc.phpt Mon Jul 6 14:36:52 2009 @@ -150,6 +150,19 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +@mysqli_query($link, "DROP PROCEDURE IS EXISTS p"); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [%u|b%"id"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_real_connect.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_real_connect.phpt diff -u php-src/ext/mysqli/tests/mysqli_real_connect.phpt:1.8 php-src/ext/mysqli/tests/mysqli_real_connect.phpt:1.9 --- php-src/ext/mysqli/tests/mysqli_real_connect.phpt:1.8 Thu May 28 14:11:40 2009 +++ php-src/ext/mysqli/tests/mysqli_real_connect.phpt Mon Jul 6 14:36:52 2009 @@ -170,6 +170,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_real_connect(): (%d/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d object(mysqli)#%d (%d) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt diff -u php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt:1.3 php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt:1.3 Wed Feb 6 11:35:44 2008 +++ php-src/ext/mysqli/tests/mysqli_real_connect_pconn.phpt Mon Jul 6 14:36:52 2009 @@ -146,6 +146,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_real_connect(): (%d/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_real_query.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_real_query.phpt diff -u php-src/ext/mysqli/tests/mysqli_real_query.phpt:1.6 php-src/ext/mysqli/tests/mysqli_real_query.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_real_query.phpt:1.6 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_real_query.phpt Mon Jul 6 14:36:52 2009 @@ -89,6 +89,20 @@ print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +@mysqli_query($link, "DROP PROCEDURE IF EXISTS p"); +@mysqli_query($link, "DROP FUNCTION IF EXISTS f"); + +mysqli_close($link); +?> --EXPECTF-- array(1) { [%u|b%"valid"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_report.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_report.phpt diff -u php-src/ext/mysqli/tests/mysqli_report.phpt:1.6 php-src/ext/mysqli/tests/mysqli_report.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_report.phpt:1.6 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_report.phpt Mon Jul 6 14:36:52 2009 @@ -280,6 +280,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_multi_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BAR; FOO' at line 1 in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_report_wo_ps.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_report_wo_ps.phpt diff -u php-src/ext/mysqli/tests/mysqli_report_wo_ps.phpt:1.2 php-src/ext/mysqli/tests/mysqli_report_wo_ps.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_report_wo_ps.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_report_wo_ps.phpt Mon Jul 6 14:36:52 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_report() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -92,6 +92,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_multi_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BAR; FOO' at line 1 in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_result_references.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_result_references.phpt diff -u php-src/ext/mysqli/tests/mysqli_result_references.phpt:1.6 php-src/ext/mysqli/tests/mysqli_result_references.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_result_references.phpt:1.6 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_result_references.phpt Mon Jul 6 14:36:52 2009 @@ -76,6 +76,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- array(7) refcount(2){ [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_rollback.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_rollback.phpt diff -u php-src/ext/mysqli/tests/mysqli_rollback.phpt:1.2 php-src/ext/mysqli/tests/mysqli_rollback.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_rollback.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_rollback.phpt Mon Jul 6 14:36:52 2009 @@ -80,6 +80,10 @@ print "done!\n"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_rollback(): Couldn't fetch mysqli in %s on line %d done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_charset.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_charset.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_charset.phpt:1.4 php-src/ext/mysqli/tests/mysqli_set_charset.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_set_charset.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_set_charset.phpt Mon Jul 6 14:36:52 2009 @@ -125,6 +125,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_set_charset(): Couldn't fetch mysqli in %s on line %d done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_default.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_default.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_default.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_local_infile_default.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_default.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_default.phpt Mon Jul 6 14:36:52 2009 @@ -109,6 +109,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_simple' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt:1.6 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt:1.6 Fri May 29 13:36:53 2009 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt Mon Jul 6 14:36:52 2009 @@ -164,6 +164,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_simple' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt Mon Jul 6 14:36:52 2009 @@ -69,6 +69,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_bad_character' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt Mon Jul 6 14:36:52 2009 @@ -54,6 +54,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_buffer_overflow' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt Mon Jul 6 14:36:52 2009 @@ -59,6 +59,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_close_link' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt Mon Jul 6 14:36:52 2009 @@ -58,6 +58,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_closefile' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt:1.1 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt:1.2 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt:1.1 Thu Jul 17 09:52:51 2008 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt Mon Jul 6 14:36:52 2009 @@ -58,6 +58,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'Closure object' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt Mon Jul 6 14:36:52 2009 @@ -58,6 +58,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_kill_link' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt Mon Jul 6 14:36:52 2009 @@ -54,6 +54,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_negative_len' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt Mon Jul 6 14:36:52 2009 @@ -101,6 +101,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_report_short_len' Callback - report_short_len(): 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt Mon Jul 6 14:36:52 2009 @@ -66,6 +66,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_new_query' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt Mon Jul 6 14:36:52 2009 @@ -57,6 +57,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_nofileop' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt:1.2 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt:1.2 Wed Oct 10 10:46:06 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt Mon Jul 6 14:36:52 2009 @@ -101,6 +101,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: tempnam(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (%s) in %s on line %d [005 + 1] Cannot create CVS file '' http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt:1.4 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt Mon Jul 6 14:36:52 2009 @@ -65,6 +65,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_replace_buffer' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt Mon Jul 6 14:36:52 2009 @@ -94,6 +94,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_short_len' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt Mon Jul 6 14:36:52 2009 @@ -57,6 +57,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_unregister' Callback: 0 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt diff -u php-src/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt:1.3 php-src/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt:1.3 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt Mon Jul 6 14:36:52 2009 @@ -143,5 +143,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_sqlstate.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_sqlstate.phpt diff -u php-src/ext/mysqli/tests/mysqli_sqlstate.phpt:1.2 php-src/ext/mysqli/tests/mysqli_sqlstate.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_sqlstate.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_sqlstate.phpt Mon Jul 6 14:36:52 2009 @@ -1,9 +1,9 @@ --TEST-- mysqli_sqlstate() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -35,6 +35,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- NULL %s(5) "00000" http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt:1.7 php-src/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt:1.8 --- php-src/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt:1.7 Fri May 29 11:59:09 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt Mon Jul 6 14:36:52 2009 @@ -241,6 +241,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [009] [%d] (error message varies with the MySQL Server version, check the error code) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_attr_get.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_attr_get.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_attr_get.phpt:1.3 php-src/ext/mysqli/tests/mysqli_stmt_attr_get.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_stmt_attr_get.phpt:1.3 Tue Mar 18 16:58:43 2008 +++ php-src/ext/mysqli/tests/mysqli_stmt_attr_get.phpt Mon Jul 6 14:36:52 2009 @@ -62,5 +62,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt Mon Jul 6 14:36:52 2009 @@ -22,5 +22,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_attr_set.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_attr_set.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_attr_set.phpt:1.4 php-src/ext/mysqli/tests/mysqli_stmt_attr_set.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_stmt_attr_set.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_attr_set.phpt Mon Jul 6 14:36:52 2009 @@ -259,5 +259,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_bind_param.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_bind_param.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_bind_param.phpt:1.3 php-src/ext/mysqli/tests/mysqli_stmt_bind_param.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_stmt_bind_param.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_bind_param.phpt Mon Jul 6 14:36:52 2009 @@ -370,7 +370,7 @@ printf("[2014] Cannot find row id = %d\n", $values['id']); else if (isset($row['label']) && ($values['label'] != $row['label'])) printf("[2015] Expecting label = %s, got label = %s\n", $values['label'], $row['label']); - + mysqli_free_result($res); } @@ -383,6 +383,10 @@ printf("[021] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_bind_param(): Number of elements in type definition string doesn't match number of bind variables in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt:1.4 php-src/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt Mon Jul 6 14:36:52 2009 @@ -328,6 +328,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Regular, procedural, using variables int(1) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt:1.5 php-src/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt:1.5 Fri Jul 3 07:49:47 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt Mon Jul 6 14:36:52 2009 @@ -62,6 +62,10 @@ echo("$one - $two\n\n"); echo "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Test 1: object(foo)#%d (1) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt Mon Jul 6 14:36:52 2009 @@ -199,5 +199,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt:1.4 php-src/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt Mon Jul 6 14:36:52 2009 @@ -120,5 +120,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_bind_result.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_bind_result.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_bind_result.phpt:1.5 php-src/ext/mysqli/tests/mysqli_stmt_bind_result.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_stmt_bind_result.phpt:1.5 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_bind_result.phpt Mon Jul 6 14:36:52 2009 @@ -308,6 +308,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_bind_result(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt:1.5 php-src/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt:1.5 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt Mon Jul 6 14:36:52 2009 @@ -151,5 +151,9 @@ mysqli_close($link_sel); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt:1.2 Wed Oct 10 10:46:06 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt Mon Jul 6 14:36:52 2009 @@ -329,5 +329,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt:1.5 php-src/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt:1.5 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt Mon Jul 6 14:36:52 2009 @@ -242,6 +242,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- plain vanilla... int(1) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt:1.1 php-src/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt:1.2 --- php-src/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt:1.1 Fri Jan 4 18:17:13 2008 +++ php-src/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt Mon Jul 6 14:36:52 2009 @@ -89,5 +89,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_close.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_close.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_close.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_close.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_close.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_close.phpt Mon Jul 6 14:36:52 2009 @@ -79,6 +79,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_close(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_data_seek.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_data_seek.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_data_seek.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_data_seek.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_data_seek.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_data_seek.phpt Mon Jul 6 14:36:52 2009 @@ -81,6 +81,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_data_seek(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt:1.4 php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt Mon Jul 6 14:36:52 2009 @@ -9,8 +9,6 @@ --FILE-- <?php include "connect.inc"; - require('table.inc'); - if (!$c1 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -25,7 +23,7 @@ $c1->query("use $db"); $c2->query("use $db"); $c1->query("drop table if exists type_change"); - $c1->query("create table type_change(a int, b char(10))"); + $c1->query("create table type_change(a int, b char(10)) ENGINE = " . $engine); $c1->query("insert into type_change values (1, 'one'), (2, 'two')"); $s1 = $c1->prepare("select a from type_change order by a"); var_dump($s1->execute(), $s1->bind_result($col1)); @@ -56,6 +54,18 @@ echo "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS type_change")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> + --EXPECTF-- bool(true) bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_errno.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_errno.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_errno.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_errno.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_errno.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_errno.phpt Mon Jul 6 14:36:52 2009 @@ -59,6 +59,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_errno(): Couldn't fetch mysqli_stmt in %s on line %d done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_error.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_error.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_error.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_error.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_error.phpt Mon Jul 6 14:36:52 2009 @@ -59,6 +59,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_error(): Couldn't fetch mysqli_stmt in %s on line %d done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_execute.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_execute.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_execute.phpt:1.4 php-src/ext/mysqli/tests/mysqli_stmt_execute.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_stmt_execute.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_execute.phpt Mon Jul 6 14:36:52 2009 @@ -126,6 +126,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_execute(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt:1.5 php-src/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt:1.5 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt Mon Jul 6 14:36:52 2009 @@ -181,5 +181,18 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +@mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'); + +mysqli_close($link); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_fetch.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_fetch.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_fetch.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_fetch.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_fetch.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_fetch.phpt Mon Jul 6 14:36:52 2009 @@ -85,6 +85,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_fetch(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt Mon Jul 6 14:36:52 2009 @@ -67,5 +67,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- -done! +done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt:1.3 php-src/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt:1.3 Sat May 24 15:13:09 2008 +++ php-src/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt Mon Jul 6 14:36:52 2009 @@ -46,6 +46,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- OK: 1 OK: 2 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_field_count.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_field_count.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_field_count.phpt:1.6 php-src/ext/mysqli/tests/mysqli_stmt_field_count.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_stmt_field_count.phpt:1.6 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_field_count.phpt Mon Jul 6 14:36:52 2009 @@ -81,6 +81,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_field_count(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_free_result.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_free_result.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_free_result.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_free_result.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_free_result.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_free_result.phpt Mon Jul 6 14:36:52 2009 @@ -74,6 +74,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_free_result(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_get_result.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_get_result.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_get_result.phpt:1.4 php-src/ext/mysqli/tests/mysqli_stmt_get_result.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_stmt_get_result.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_get_result.phpt Mon Jul 6 14:36:52 2009 @@ -155,6 +155,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_fetch(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_get_result2.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_get_result2.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_get_result2.phpt:1.4 php-src/ext/mysqli/tests/mysqli_stmt_get_result2.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_stmt_get_result2.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_get_result2.phpt Mon Jul 6 14:36:52 2009 @@ -151,6 +151,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- array(2) { [%u|b%"id"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt Mon Jul 6 14:36:52 2009 @@ -125,5 +125,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt Mon Jul 6 14:36:52 2009 @@ -5,7 +5,7 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); - + if (!function_exists('mysqli_stmt_get_result')) die('skip mysqli_stmt_get_result not available'); ?> @@ -42,6 +42,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- 2 2 done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt:1.4 php-src/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt Mon Jul 6 14:36:52 2009 @@ -206,6 +206,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- array(2) { [%u|b%"id"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt:1.6 php-src/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt:1.7 --- php-src/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt:1.6 Fri Jul 3 08:23:57 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt Mon Jul 6 14:36:52 2009 @@ -39,6 +39,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- object(stdClass)#%d (11) { [%u|b%"name"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt:1.4 php-src/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt Mon Jul 6 14:36:52 2009 @@ -88,5 +88,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt Mon Jul 6 14:36:52 2009 @@ -114,6 +114,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_data_seek(): Couldn't fetch mysqli_result in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt:1.3 php-src/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt:1.3 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt Mon Jul 6 14:36:52 2009 @@ -251,5 +251,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt:1.3 php-src/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt Mon Jul 6 14:36:52 2009 @@ -79,6 +79,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_get_warnings(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_init.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_init.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_init.phpt:1.3 php-src/ext/mysqli/tests/mysqli_stmt_init.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_stmt_init.phpt:1.3 Wed Oct 10 10:51:34 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_init.phpt Mon Jul 6 14:36:52 2009 @@ -44,6 +44,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_close(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_insert_id.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_insert_id.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_insert_id.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_insert_id.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_insert_id.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_insert_id.phpt Mon Jul 6 14:36:52 2009 @@ -67,6 +67,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_insert_id(): Couldn't fetch mysqli_stmt in %s on line %d NULL http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_num_rows.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_num_rows.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_num_rows.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_num_rows.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_num_rows.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_num_rows.phpt Mon Jul 6 14:36:52 2009 @@ -97,6 +97,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- run_tests.php don't fool me with your 'ungreedy' expression '.+?'! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_param_count.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_param_count.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_param_count.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_param_count.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_param_count.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_param_count.phpt Mon Jul 6 14:36:52 2009 @@ -60,6 +60,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_param_count(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_prepare.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_prepare.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_prepare.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_prepare.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_prepare.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_prepare.phpt Mon Jul 6 14:36:52 2009 @@ -47,6 +47,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_prepare(): Couldn't fetch mysqli_stmt in %s on line %d done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_reset.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_reset.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_reset.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_reset.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_reset.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_reset.phpt Mon Jul 6 14:36:52 2009 @@ -99,6 +99,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_reset(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt:1.4 php-src/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt Mon Jul 6 14:36:52 2009 @@ -93,6 +93,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_result_metadata(): invalid object or resource mysqli_stmt http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt:1.4 php-src/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt:1.5 --- php-src/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt:1.4 Thu May 28 14:11:41 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt Mon Jul 6 14:36:52 2009 @@ -225,5 +225,9 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt:1.8 php-src/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt:1.9 --- php-src/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt:1.8 Thu May 28 17:49:00 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt Mon Jul 6 14:36:52 2009 @@ -126,6 +126,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_send_long_data(): Invalid parameter number in %s on line %d done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt:1.3 php-src/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt:1.4 --- php-src/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt:1.3 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt Mon Jul 6 14:36:52 2009 @@ -91,5 +91,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt:1.5 php-src/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt:1.5 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt Mon Jul 6 14:36:52 2009 @@ -96,5 +96,9 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt:1.2 php-src/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt Mon Jul 6 14:36:52 2009 @@ -51,6 +51,10 @@ mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_sqlstate(): invalid object or resource mysqli_stmt in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_stmt_store_result.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_stmt_store_result.phpt diff -u php-src/ext/mysqli/tests/mysqli_stmt_store_result.phpt:1.5 php-src/ext/mysqli/tests/mysqli_stmt_store_result.phpt:1.6 --- php-src/ext/mysqli/tests/mysqli_stmt_store_result.phpt:1.5 Thu May 28 15:47:08 2009 +++ php-src/ext/mysqli/tests/mysqli_stmt_store_result.phpt Mon Jul 6 14:36:52 2009 @@ -82,5 +82,9 @@ mysqli_close($link_buf); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_store_result.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_store_result.phpt diff -u php-src/ext/mysqli/tests/mysqli_store_result.phpt:1.2 php-src/ext/mysqli/tests/mysqli_store_result.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_store_result.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_store_result.phpt Mon Jul 6 14:36:52 2009 @@ -55,6 +55,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_store_result(): Couldn't fetch mysqli in %s on line %d done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_thread_id.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_thread_id.phpt diff -u php-src/ext/mysqli/tests/mysqli_thread_id.phpt:1.2 php-src/ext/mysqli/tests/mysqli_thread_id.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_thread_id.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_thread_id.phpt Mon Jul 6 14:36:52 2009 @@ -35,6 +35,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_thread_id(): Couldn't fetch mysqli in %s on line %d done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_use_result.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_use_result.phpt diff -u php-src/ext/mysqli/tests/mysqli_use_result.phpt:1.2 php-src/ext/mysqli/tests/mysqli_use_result.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_use_result.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_use_result.phpt Mon Jul 6 14:36:52 2009 @@ -55,6 +55,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_data_seek(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_warning_count.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_warning_count.phpt diff -u php-src/ext/mysqli/tests/mysqli_warning_count.phpt:1.2 php-src/ext/mysqli/tests/mysqli_warning_count.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_warning_count.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_warning_count.phpt Mon Jul 6 14:36:52 2009 @@ -43,6 +43,10 @@ print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_warning_count(): Couldn't fetch mysqli in %s on line %d done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_warning_unclonable.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_warning_unclonable.phpt diff -u php-src/ext/mysqli/tests/mysqli_warning_unclonable.phpt:1.2 php-src/ext/mysqli/tests/mysqli_warning_unclonable.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_warning_unclonable.phpt:1.2 Thu Aug 9 10:01:20 2007 +++ php-src/ext/mysqli/tests/mysqli_warning_unclonable.phpt Mon Jul 6 14:36:52 2009 @@ -33,5 +33,9 @@ $warning_clone = clone $warning; print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Fatal error: Trying to clone an uncloneable object of class mysqli_warning in %s on line %d \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/clean_table.inc?view=markup&rev=1.1 Index: php-src/ext/mysqli/tests/clean_table.inc +++ php-src/ext/mysqli/tests/clean_table.inc <?PHP require_once('connect.inc'); if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[clean] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); } if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) { printf("[clean] Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); } mysqli_close($link); ?>