Author: uwendel
Date: 2007-08-08 13:05:20 +0200 (Wed, 08 Aug 2007)
New Revision: 861
Added:
trunk/tests/ext/mysqli/skipifconnectfailure.inc
Modified:
trunk/tests/ext/mysqli/001.phpt
trunk/tests/ext/mysqli/002.phpt
trunk/tests/ext/mysqli/003.phpt
trunk/tests/ext/mysqli/004.phpt
trunk/tests/ext/mysqli/005.phpt
trunk/tests/ext/mysqli/006.phpt
trunk/tests/ext/mysqli/007.phpt
trunk/tests/ext/mysqli/008.phpt
trunk/tests/ext/mysqli/009.phpt
trunk/tests/ext/mysqli/010.phpt
trunk/tests/ext/mysqli/011.phpt
trunk/tests/ext/mysqli/012.phpt
trunk/tests/ext/mysqli/013.phpt
trunk/tests/ext/mysqli/014.phpt
trunk/tests/ext/mysqli/015.phpt
trunk/tests/ext/mysqli/016.phpt
trunk/tests/ext/mysqli/017.phpt
trunk/tests/ext/mysqli/018.phpt
trunk/tests/ext/mysqli/019.phpt
trunk/tests/ext/mysqli/020.phpt
trunk/tests/ext/mysqli/021.phpt
trunk/tests/ext/mysqli/022.phpt
trunk/tests/ext/mysqli/023.phpt
trunk/tests/ext/mysqli/024.phpt
trunk/tests/ext/mysqli/025.phpt
trunk/tests/ext/mysqli/026.phpt
trunk/tests/ext/mysqli/027.phpt
trunk/tests/ext/mysqli/028.phpt
trunk/tests/ext/mysqli/029.phpt
trunk/tests/ext/mysqli/030.phpt
trunk/tests/ext/mysqli/031.phpt
trunk/tests/ext/mysqli/032.phpt
trunk/tests/ext/mysqli/033.phpt
trunk/tests/ext/mysqli/034.phpt
trunk/tests/ext/mysqli/035.phpt
trunk/tests/ext/mysqli/036.phpt
trunk/tests/ext/mysqli/037.phpt
trunk/tests/ext/mysqli/038.phpt
trunk/tests/ext/mysqli/039.phpt
trunk/tests/ext/mysqli/040.phpt
trunk/tests/ext/mysqli/041.phpt
trunk/tests/ext/mysqli/042.phpt
trunk/tests/ext/mysqli/043.phpt
trunk/tests/ext/mysqli/044.phpt
trunk/tests/ext/mysqli/045.phpt
trunk/tests/ext/mysqli/046.phpt
trunk/tests/ext/mysqli/047.phpt
trunk/tests/ext/mysqli/048.phpt
trunk/tests/ext/mysqli/049.phpt
trunk/tests/ext/mysqli/050.phpt
trunk/tests/ext/mysqli/051.phpt
trunk/tests/ext/mysqli/052.phpt
trunk/tests/ext/mysqli/053.phpt
trunk/tests/ext/mysqli/054.phpt
trunk/tests/ext/mysqli/055.phpt
trunk/tests/ext/mysqli/056.phpt
trunk/tests/ext/mysqli/057.phpt
trunk/tests/ext/mysqli/058.phpt
trunk/tests/ext/mysqli/059.phpt
trunk/tests/ext/mysqli/060.phpt
trunk/tests/ext/mysqli/061.phpt
trunk/tests/ext/mysqli/062.phpt
trunk/tests/ext/mysqli/063.phpt
trunk/tests/ext/mysqli/064.phpt
trunk/tests/ext/mysqli/065.phpt
trunk/tests/ext/mysqli/066.phpt
trunk/tests/ext/mysqli/069.phpt
trunk/tests/ext/mysqli/070.phpt
trunk/tests/ext/mysqli/071.phpt
trunk/tests/ext/mysqli/072.phpt
trunk/tests/ext/mysqli/074.phpt
trunk/tests/ext/mysqli/bench/framework/config.php
trunk/tests/ext/mysqli/bug28817.phpt
trunk/tests/ext/mysqli/bug29311.phpt
trunk/tests/ext/mysqli/bug30967.phpt
trunk/tests/ext/mysqli/bug31141.phpt
trunk/tests/ext/mysqli/bug31668.phpt
trunk/tests/ext/mysqli/bug32405.phpt
trunk/tests/ext/mysqli/bug33090.phpt
trunk/tests/ext/mysqli/bug33263.phpt
trunk/tests/ext/mysqli/bug33491.phpt
trunk/tests/ext/mysqli/bug34785.phpt
trunk/tests/ext/mysqli/bug34810.phpt
trunk/tests/ext/mysqli/bug35103.phpt
trunk/tests/ext/mysqli/bug35517.phpt
trunk/tests/ext/mysqli/bug35759.phpt
trunk/tests/ext/mysqli/bug36420.phpt
trunk/tests/ext/mysqli/bug36745.phpt
trunk/tests/ext/mysqli/bug36802.phpt
trunk/tests/ext/mysqli/bug36949.phpt
trunk/tests/ext/mysqli/bug38003.phpt
trunk/tests/ext/mysqli/bug38710.phpt
trunk/tests/ext/mysqli/mysqli_affected_rows.phpt
trunk/tests/ext/mysqli/mysqli_affected_rows_oo.phpt
trunk/tests/ext/mysqli/mysqli_autocommit.phpt
trunk/tests/ext/mysqli/mysqli_autocommit_oo.phpt
trunk/tests/ext/mysqli/mysqli_change_user.phpt
trunk/tests/ext/mysqli/mysqli_change_user_oo.phpt
trunk/tests/ext/mysqli/mysqli_character_set.phpt
trunk/tests/ext/mysqli/mysqli_character_set_name.phpt
trunk/tests/ext/mysqli/mysqli_character_set_name_oo.phpt
trunk/tests/ext/mysqli/mysqli_class_mysqli_interface.phpt
trunk/tests/ext/mysqli/mysqli_class_mysqli_result_interface.phpt
trunk/tests/ext/mysqli/mysqli_class_mysqli_result_reflection.phpt
trunk/tests/ext/mysqli/mysqli_class_mysqli_stmt_interface.phpt
trunk/tests/ext/mysqli/mysqli_class_mysqli_warning.phpt
trunk/tests/ext/mysqli/mysqli_close.phpt
trunk/tests/ext/mysqli/mysqli_close_oo.phpt
trunk/tests/ext/mysqli/mysqli_commit.phpt
trunk/tests/ext/mysqli/mysqli_commit_oo.phpt
trunk/tests/ext/mysqli/mysqli_connect_errno.phpt
trunk/tests/ext/mysqli/mysqli_connect_error.phpt
trunk/tests/ext/mysqli/mysqli_connect_oo_warnings.phpt
trunk/tests/ext/mysqli/mysqli_connect_twice.phpt
trunk/tests/ext/mysqli/mysqli_constants.phpt
trunk/tests/ext/mysqli/mysqli_data_seek.phpt
trunk/tests/ext/mysqli/mysqli_data_seek_oo.phpt
trunk/tests/ext/mysqli/mysqli_debug.phpt
trunk/tests/ext/mysqli/mysqli_disable_reads_from_master.phpt
trunk/tests/ext/mysqli/mysqli_disable_rpl_parse.phpt
trunk/tests/ext/mysqli/mysqli_driver.phpt
trunk/tests/ext/mysqli/mysqli_dump_debug_info.phpt
trunk/tests/ext/mysqli/mysqli_dump_debug_info_oo.phpt
trunk/tests/ext/mysqli/mysqli_embedded_connect.phpt
trunk/tests/ext/mysqli/mysqli_enable_reads_from_master.phpt
trunk/tests/ext/mysqli/mysqli_enable_rpl_parse.phpt
trunk/tests/ext/mysqli/mysqli_errno.phpt
trunk/tests/ext/mysqli/mysqli_errno_oo.phpt
trunk/tests/ext/mysqli/mysqli_error.phpt
trunk/tests/ext/mysqli/mysqli_error_oo.phpt
trunk/tests/ext/mysqli/mysqli_error_unicode.phpt
trunk/tests/ext/mysqli/mysqli_explain_metadata.phpt
trunk/tests/ext/mysqli/mysqli_fetch_all.phpt
trunk/tests/ext/mysqli/mysqli_fetch_all_oo.phpt
trunk/tests/ext/mysqli/mysqli_fetch_array.phpt
trunk/tests/ext/mysqli/mysqli_fetch_array_assoc.phpt
trunk/tests/ext/mysqli/mysqli_fetch_array_many_rows.phpt
trunk/tests/ext/mysqli/mysqli_fetch_array_oo.phpt
trunk/tests/ext/mysqli/mysqli_fetch_assoc.phpt
trunk/tests/ext/mysqli/mysqli_fetch_assoc_bit.phpt
trunk/tests/ext/mysqli/mysqli_fetch_assoc_no_alias.phpt
trunk/tests/ext/mysqli/mysqli_fetch_assoc_no_alias_utf8.phpt
trunk/tests/ext/mysqli/mysqli_fetch_assoc_oo.phpt
trunk/tests/ext/mysqli/mysqli_fetch_field.phpt
trunk/tests/ext/mysqli/mysqli_fetch_field_direct.phpt
trunk/tests/ext/mysqli/mysqli_fetch_field_direct_oo.phpt
trunk/tests/ext/mysqli/mysqli_fetch_field_oo.phpt
trunk/tests/ext/mysqli/mysqli_fetch_fields.phpt
trunk/tests/ext/mysqli/mysqli_fetch_lengths.phpt
trunk/tests/ext/mysqli/mysqli_fetch_lengths_oo.phpt
trunk/tests/ext/mysqli/mysqli_fetch_object.phpt
trunk/tests/ext/mysqli/mysqli_fetch_object_no_constructor.phpt
trunk/tests/ext/mysqli/mysqli_fetch_object_no_object.phpt
trunk/tests/ext/mysqli/mysqli_fetch_object_oo.phpt
trunk/tests/ext/mysqli/mysqli_fetch_row.phpt
trunk/tests/ext/mysqli/mysqli_field_count.phpt
trunk/tests/ext/mysqli/mysqli_field_seek.phpt
trunk/tests/ext/mysqli/mysqli_field_tell.phpt
trunk/tests/ext/mysqli/mysqli_fork.phpt
trunk/tests/ext/mysqli/mysqli_free_result.phpt
trunk/tests/ext/mysqli/mysqli_get_cache_stats.phpt
trunk/tests/ext/mysqli/mysqli_get_cache_stats_free_buffered.phpt
trunk/tests/ext/mysqli/mysqli_get_charset.phpt
trunk/tests/ext/mysqli/mysqli_get_client_info.phpt
trunk/tests/ext/mysqli/mysqli_get_client_stats.phpt
trunk/tests/ext/mysqli/mysqli_get_client_version.phpt
trunk/tests/ext/mysqli/mysqli_get_connection_stats.phpt
trunk/tests/ext/mysqli/mysqli_get_host_info.phpt
trunk/tests/ext/mysqli/mysqli_get_proto_info.phpt
trunk/tests/ext/mysqli/mysqli_get_server_info.phpt
trunk/tests/ext/mysqli/mysqli_get_server_version.phpt
trunk/tests/ext/mysqli/mysqli_get_warnings.phpt
trunk/tests/ext/mysqli/mysqli_info.phpt
trunk/tests/ext/mysqli/mysqli_init.phpt
trunk/tests/ext/mysqli/mysqli_insert_id.phpt
trunk/tests/ext/mysqli/mysqli_kill.phpt
trunk/tests/ext/mysqli/mysqli_more_results.phpt
trunk/tests/ext/mysqli/mysqli_multi_query.phpt
trunk/tests/ext/mysqli/mysqli_mysqli_result_invalid_mode.phpt
trunk/tests/ext/mysqli/mysqli_next_result.phpt
trunk/tests/ext/mysqli/mysqli_num_fields.phpt
trunk/tests/ext/mysqli/mysqli_num_rows.phpt
trunk/tests/ext/mysqli/mysqli_options.phpt
trunk/tests/ext/mysqli/mysqli_options_init_command.phpt
trunk/tests/ext/mysqli/mysqli_pconnect.phpt
trunk/tests/ext/mysqli/mysqli_phpinfo.phpt
trunk/tests/ext/mysqli/mysqli_ping.phpt
trunk/tests/ext/mysqli/mysqli_prepare.phpt
trunk/tests/ext/mysqli/mysqli_prepare_no_object.phpt
trunk/tests/ext/mysqli/mysqli_query.phpt
trunk/tests/ext/mysqli/mysqli_query_unicode.phpt
trunk/tests/ext/mysqli/mysqli_real_connect.phpt
trunk/tests/ext/mysqli/mysqli_real_escape_string.phpt
trunk/tests/ext/mysqli/mysqli_real_escape_string_unicode.phpt
trunk/tests/ext/mysqli/mysqli_real_query.phpt
trunk/tests/ext/mysqli/mysqli_report.phpt
trunk/tests/ext/mysqli/mysqli_report_wo_ps.phpt
trunk/tests/ext/mysqli/mysqli_result_references.phpt
trunk/tests/ext/mysqli/mysqli_result_references_mysqlnd.phpt
trunk/tests/ext/mysqli/mysqli_result_unclonable.phpt
trunk/tests/ext/mysqli/mysqli_rollback.phpt
trunk/tests/ext/mysqli/mysqli_select_db.phpt
trunk/tests/ext/mysqli/mysqli_set_charset.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_default.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_bad_character.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_buffer_overflow.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_close_link.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_closefile.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_kill_link.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_negative_len.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nested_call.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_new_query.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nofileop.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_replace_buffer.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_short_len.phpt
trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_unregister.phpt
trunk/tests/ext/mysqli/mysqli_set_opt.phpt
trunk/tests/ext/mysqli/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt
trunk/tests/ext/mysqli/mysqli_sqlstate.phpt
trunk/tests/ext/mysqli/mysqli_ssl_set.phpt
trunk/tests/ext/mysqli/mysqli_stat.phpt
trunk/tests/ext/mysqli/mysqli_stmt_affected_rows.phpt
trunk/tests/ext/mysqli/mysqli_stmt_attr_get.phpt
trunk/tests/ext/mysqli/mysqli_stmt_attr_get_prefetch.phpt
trunk/tests/ext/mysqli/mysqli_stmt_attr_set.phpt
trunk/tests/ext/mysqli/mysqli_stmt_bind_param.phpt
trunk/tests/ext/mysqli/mysqli_stmt_bind_param_references.phpt
trunk/tests/ext/mysqli/mysqli_stmt_bind_param_type_juggling.phpt
trunk/tests/ext/mysqli/mysqli_stmt_bind_result.phpt
trunk/tests/ext/mysqli/mysqli_stmt_bind_result_references.phpt
trunk/tests/ext/mysqli/mysqli_stmt_close.phpt
trunk/tests/ext/mysqli/mysqli_stmt_data_seek.phpt
trunk/tests/ext/mysqli/mysqli_stmt_errno.phpt
trunk/tests/ext/mysqli/mysqli_stmt_error.phpt
trunk/tests/ext/mysqli/mysqli_stmt_execute.phpt
trunk/tests/ext/mysqli/mysqli_stmt_fetch.phpt
trunk/tests/ext/mysqli/mysqli_stmt_fetch_bit.phpt
trunk/tests/ext/mysqli/mysqli_stmt_fetch_fields_win32_unicode.phpt
trunk/tests/ext/mysqli/mysqli_stmt_field_count.phpt
trunk/tests/ext/mysqli/mysqli_stmt_free_result.phpt
trunk/tests/ext/mysqli/mysqli_stmt_get_result.phpt
trunk/tests/ext/mysqli/mysqli_stmt_get_result2.phpt
trunk/tests/ext/mysqli/mysqli_stmt_get_result_bit.phpt
trunk/tests/ext/mysqli/mysqli_stmt_get_result_field_count.phpt
trunk/tests/ext/mysqli/mysqli_stmt_get_result_metadata.phpt
trunk/tests/ext/mysqli/mysqli_stmt_get_result_metadata_fetch_field.phpt
trunk/tests/ext/mysqli/mysqli_stmt_get_result_seek.phpt
trunk/tests/ext/mysqli/mysqli_stmt_get_warnings.phpt
trunk/tests/ext/mysqli/mysqli_stmt_init.phpt
trunk/tests/ext/mysqli/mysqli_stmt_insert_id.phpt
trunk/tests/ext/mysqli/mysqli_stmt_num_rows.phpt
trunk/tests/ext/mysqli/mysqli_stmt_param_count.phpt
trunk/tests/ext/mysqli/mysqli_stmt_prepare.phpt
trunk/tests/ext/mysqli/mysqli_stmt_reset.phpt
trunk/tests/ext/mysqli/mysqli_stmt_result_metadata.phpt
trunk/tests/ext/mysqli/mysqli_stmt_result_metadata_sqltests.phpt
trunk/tests/ext/mysqli/mysqli_stmt_send_long_data.phpt
trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
trunk/tests/ext/mysqli/mysqli_stmt_sqlstate.phpt
trunk/tests/ext/mysqli/mysqli_stmt_store_result.phpt
trunk/tests/ext/mysqli/mysqli_stmt_unclonable.phpt
trunk/tests/ext/mysqli/mysqli_store_result.phpt
trunk/tests/ext/mysqli/mysqli_thread_id.phpt
trunk/tests/ext/mysqli/mysqli_thread_safe.phpt
trunk/tests/ext/mysqli/mysqli_unclonable.phpt
trunk/tests/ext/mysqli/mysqli_use_result.phpt
trunk/tests/ext/mysqli/mysqli_warning_count.phpt
trunk/tests/ext/mysqli/mysqli_warning_unclonable.phpt
Log:
Introducting new environment variable MYSQL_TEST_SKIP_CONNECT_FAILURE upon request of the
PHP folks.
If the value of MYSQL_TEST_SKIP_CONNECT_FAILURE evaluates to true in PHP and a test cannot
connect
to the database server then the test will be skipped. So far a test that could not connect
would have
always caused a test failure.
Modified: trunk/tests/ext/mysqli/001.phpt
===================================================================
--- trunk/tests/ext/mysqli/001.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/001.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli connect
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/002.phpt
===================================================================
--- trunk/tests/ext/mysqli/002.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/002.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli bind_result 1
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/003.phpt
===================================================================
--- trunk/tests/ext/mysqli/003.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/003.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli connect
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/004.phpt
===================================================================
--- trunk/tests/ext/mysqli/004.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/004.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli fetch char/text
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include ("connect.inc");
Modified: trunk/tests/ext/mysqli/005.phpt
===================================================================
--- trunk/tests/ext/mysqli/005.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/005.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli fetch char/text long
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/006.phpt
===================================================================
--- trunk/tests/ext/mysqli/006.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/006.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli fetch long values
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/007.phpt
===================================================================
--- trunk/tests/ext/mysqli/007.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/007.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli fetch short values
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/008.phpt
===================================================================
--- trunk/tests/ext/mysqli/008.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/008.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli fetch tinyint values
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/009.phpt
===================================================================
--- trunk/tests/ext/mysqli/009.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/009.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -7,6 +7,7 @@
exit;
}
require_once('skipif.inc');
+ require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/010.phpt
===================================================================
--- trunk/tests/ext/mysqli/010.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/010.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -3,7 +3,10 @@
--INI--
precision=12
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/011.phpt
===================================================================
--- trunk/tests/ext/mysqli/011.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/011.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -3,7 +3,10 @@
--INI--
precision=12
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/012.phpt
===================================================================
--- trunk/tests/ext/mysqli/012.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/012.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -3,7 +3,10 @@
--INI--
precision=12
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/013.phpt
===================================================================
--- trunk/tests/ext/mysqli/013.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/013.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli fetch mixed / mysql_query (may fail when using 4.1 library with 5.x server)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/014.phpt
===================================================================
--- trunk/tests/ext/mysqli/014.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/014.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -3,6 +3,7 @@
--SKIPIF--
<?php
require_once('skipif.inc');
+ require_once('skipifconnectfailure.inc');
include "connect.inc";
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
if (!$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'")) {
Modified: trunk/tests/ext/mysqli/015.phpt
===================================================================
--- trunk/tests/ext/mysqli/015.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/015.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -3,6 +3,7 @@
--SKIPIF--
<?php
require_once('skipif.inc');
+ require_once('skipifconnectfailure.inc');
include "connect.inc";
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'");
Modified: trunk/tests/ext/mysqli/016.phpt
===================================================================
--- trunk/tests/ext/mysqli/016.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/016.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli fetch user variable
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/017.phpt
===================================================================
--- trunk/tests/ext/mysqli/017.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/017.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli fetch functions
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/018.phpt
===================================================================
--- trunk/tests/ext/mysqli/018.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/018.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli fetch system variables
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/019.phpt
===================================================================
--- trunk/tests/ext/mysqli/019.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/019.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli fetch (bind_param + bind_result)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/020.phpt
===================================================================
--- trunk/tests/ext/mysqli/020.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/020.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli bind_param/bind_result date
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
/* NOTE: There's an option in mysqlnd which controls if data and
Modified: trunk/tests/ext/mysqli/021.phpt
===================================================================
--- trunk/tests/ext/mysqli/021.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/021.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli bind_param+bind_result char/text
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/022.phpt
===================================================================
--- trunk/tests/ext/mysqli/022.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/022.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli bind_param/bind_result char/text long
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/023.phpt
===================================================================
--- trunk/tests/ext/mysqli/023.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/023.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli bind_param/bind_prepare fetch long values
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/024.phpt
===================================================================
--- trunk/tests/ext/mysqli/024.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/024.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli bind_param/bind_result short values
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/025.phpt
===================================================================
--- trunk/tests/ext/mysqli/025.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/025.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli bind_param/bind_result tinyint values
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/026.phpt
===================================================================
--- trunk/tests/ext/mysqli/026.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/026.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli bind_param/bind_result with send_long_data
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/027.phpt
===================================================================
--- trunk/tests/ext/mysqli/027.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/027.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_stat
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
@@ -11,7 +14,6 @@
$status = mysqli_stat($link);
-
var_dump(strlen($status) > 0);
mysqli_close($link);
Modified: trunk/tests/ext/mysqli/028.phpt
===================================================================
--- trunk/tests/ext/mysqli/028.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/028.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_character_set_name
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/029.phpt
===================================================================
--- trunk/tests/ext/mysqli/029.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/029.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_affected_rows
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/030.phpt
===================================================================
--- trunk/tests/ext/mysqli/030.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/030.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_errno
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/031.phpt
===================================================================
--- trunk/tests/ext/mysqli/031.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/031.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_error
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/032.phpt
===================================================================
--- trunk/tests/ext/mysqli/032.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/032.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_info
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/033.phpt
===================================================================
--- trunk/tests/ext/mysqli/033.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/033.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
function test: mysqli_get_host_info
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/034.phpt
===================================================================
--- trunk/tests/ext/mysqli/034.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/034.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
function test: mysqli_get_proto_info
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/035.phpt
===================================================================
--- trunk/tests/ext/mysqli/035.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/035.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_get_server_info
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/036.phpt
===================================================================
--- trunk/tests/ext/mysqli/036.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/036.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -7,6 +7,7 @@
exit;
}
require_once('skipif.inc');
+ require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/037.phpt
===================================================================
--- trunk/tests/ext/mysqli/037.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/037.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_field_count()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/038.phpt
===================================================================
--- trunk/tests/ext/mysqli/038.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/038.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_num_fields()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/039.phpt
===================================================================
--- trunk/tests/ext/mysqli/039.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/039.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_num_fields() 2
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/040.phpt
===================================================================
--- trunk/tests/ext/mysqli/040.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/040.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_num_rows()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/041.phpt
===================================================================
--- trunk/tests/ext/mysqli/041.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/041.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_warning_count()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/042.phpt
===================================================================
--- trunk/tests/ext/mysqli/042.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/042.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli_fetch_object
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/043.phpt
===================================================================
--- trunk/tests/ext/mysqli/043.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/043.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli_bind_param (UPDATE)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/044.phpt
===================================================================
--- trunk/tests/ext/mysqli/044.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/044.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli_get_server_version
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/045.phpt
===================================================================
--- trunk/tests/ext/mysqli/045.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/045.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,11 +4,11 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
-
+ require_once('skipifconnectfailure.inc');
+
include "connect.inc";
$link = mysqli_connect($host, $user, $passwd);
-
$stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
mysqli_execute($stmt);
Modified: trunk/tests/ext/mysqli/046.phpt
===================================================================
--- trunk/tests/ext/mysqli/046.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/046.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli_stmt_affected_rows (delete)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/047.phpt
===================================================================
--- trunk/tests/ext/mysqli/047.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/047.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli_get_metadata
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/048.phpt
===================================================================
--- trunk/tests/ext/mysqli/048.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/048.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli bind_result (OO-Style)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/049.phpt
===================================================================
--- trunk/tests/ext/mysqli/049.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/049.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysql_fetch_row (OO-Style)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/050.phpt
===================================================================
--- trunk/tests/ext/mysqli/050.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/050.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
non freed statement test
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/051.phpt
===================================================================
--- trunk/tests/ext/mysqli/051.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/051.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
free statement after close
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/052.phpt
===================================================================
--- trunk/tests/ext/mysqli/052.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/052.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
call statement after close
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/053.phpt
===================================================================
--- trunk/tests/ext/mysqli/053.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/053.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
not freed resultset
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/054.phpt
===================================================================
--- trunk/tests/ext/mysqli/054.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/054.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
free resultset after close
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/055.phpt
===================================================================
--- trunk/tests/ext/mysqli/055.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/055.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
free nothing
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/056.phpt
===================================================================
--- trunk/tests/ext/mysqli/056.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/056.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
extend mysqli
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/057.phpt
===================================================================
--- trunk/tests/ext/mysqli/057.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/057.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli_get_metadata
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/058.phpt
===================================================================
--- trunk/tests/ext/mysqli/058.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/058.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
multiple binds
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/059.phpt
===================================================================
--- trunk/tests/ext/mysqli/059.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/059.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
sqlmode + bind
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/060.phpt
===================================================================
--- trunk/tests/ext/mysqli/060.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/060.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli_fetch_object with classes
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/061.phpt
===================================================================
--- trunk/tests/ext/mysqli/061.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/061.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
local infile handler
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/062.phpt
===================================================================
--- trunk/tests/ext/mysqli/062.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/062.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
resultset constructor
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/063.phpt
===================================================================
--- trunk/tests/ext/mysqli/063.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/063.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
resultset constructor
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/064.phpt
===================================================================
--- trunk/tests/ext/mysqli/064.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/064.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
NULL binding
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/065.phpt
===================================================================
--- trunk/tests/ext/mysqli/065.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/065.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -3,6 +3,8 @@
--SKIPIF--
<?php
require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+
if (!function_exists('mysqli_set_charset')) {
die('skip mysqli_set_charset() not available');
}
Modified: trunk/tests/ext/mysqli/066.phpt
===================================================================
--- trunk/tests/ext/mysqli/066.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/066.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
function test: mysqli_warning object
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/069.phpt
===================================================================
--- trunk/tests/ext/mysqli/069.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/069.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli multi_query, next_result, more_results
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/070.phpt
===================================================================
--- trunk/tests/ext/mysqli/070.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/070.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli ping
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/071.phpt
===================================================================
--- trunk/tests/ext/mysqli/071.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/071.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli thread_id & kill
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/072.phpt
===================================================================
--- trunk/tests/ext/mysqli/072.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/072.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli warning_count, get_warnings
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/074.phpt
===================================================================
--- trunk/tests/ext/mysqli/074.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/074.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli_autocommit() tests
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/bench/framework/config.php
===================================================================
--- trunk/tests/ext/mysqli/bench/framework/config.php 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bench/framework/config.php 2007-08-08 11:05:20 UTC (rev 861)
@@ -9,8 +9,8 @@
// PHP binaries to use
//
$rb_binaries = array(
- 'mysqli' => '/home/nixnutz/php6_mysqli/sapi/cli/php',
- 'mysqlnd' => '/home/nixnutz/php6_mysqlnd/sapi/cli/php',
+ 'mysqli' => '/home/nixnutz/php5_mysqli/sapi/cli/php',
+ 'mysqlnd' => '/home/nixnutz/php5_mysqlnd/sapi/cli/php',
);
@@ -31,7 +31,7 @@
// port
define('RB_DB_PORT', 3306);
// socket
- define('RB_DB_SOCKET', '/tmp/mysql.sock');
+ define('RB_DB_SOCKET');
// database engine
define('RB_DB_ENGINE', 'InnoDB');
Modified: trunk/tests/ext/mysqli/bug28817.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug28817.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug28817.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,11 +1,14 @@
--TEST--
-Bug #28817 testcase (properties)
+Bug #28817 (problems with properties declared in the class extending MySQLi)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
-
+
class my_mysql extends mysqli {
public $p_test;
@@ -27,7 +30,6 @@
var_dump($mysql->errno > 0);
$mysql->close();
- print "done!";
?>
--EXPECTF--
array(2) {
@@ -37,5 +39,4 @@
%s(3) "bar"
}
NULL
-bool(true)
-done!
\ No newline at end of file
+bool(true)
\ No newline at end of file
Modified: trunk/tests/ext/mysqli/bug29311.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug29311.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug29311.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,11 +1,14 @@
--TEST--
constructor test
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
-
+
/* class 1 calls parent constructor */
class mysql1 extends mysqli {
function __construct() {
@@ -16,7 +19,7 @@
/* class 2 has an own constructor */
class mysql2 extends mysqli {
-
+
function __construct() {
global $host, $user, $passwd, $db, $port, $socket;
$this->connect($host, $user, $passwd, $db, $port, $socket);
@@ -25,26 +28,24 @@
/* class 3 has no constructor */
class mysql3 extends mysqli {
-
+
}
- $foo[0] = new mysql1();
- $foo[1] = new mysql2();
+ $foo[0] = new mysql1();
+ $foo[1] = new mysql2();
$foo[2] = new mysql3($host, $user, $passwd, $db, $port, $socket);
for ($i=0; $i < 3; $i++) {
if (($result = $foo[$i]->query("SELECT DATABASE()"))) {
$row = $result->fetch_row();
- printf("%d: %s\n", $i, ($db === $row[0]) ? "ok" : "failure");
+ printf("%d: %s\n", $i, $row[0]);
$result->close();
}
$foo[$i]->close();
}
- print "done!"
?>
--EXPECTF--
-0: ok
-1: ok
-2: ok
-done!
\ No newline at end of file
+0: test
+1: test
+2: test
Modified: trunk/tests/ext/mysqli/bug30967.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug30967.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug30967.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,11 +1,14 @@
--TEST--
-Bug #30967 testcase (properties)
+Bug #30967 (problems with properties declared in the class extending the class extending
MySQLi)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
-
+
class mysql1 extends mysqli {
}
@@ -18,8 +21,6 @@
printf("%d\n", $mysql->errno);
$mysql->close();
- print "done!";
?>
--EXPECTF--
1064
-done!
\ No newline at end of file
Modified: trunk/tests/ext/mysqli/bug31141.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug31141.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug31141.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,10 +1,9 @@
--TEST--
-Bug #31141 testcase (properties)
+Bug #31141 (properties declared in the class extending MySQLi are not available)
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
-require("connect.inc");
class Test extends mysqli
{
public $test = array();
@@ -16,7 +15,7 @@
}
}
-$my_test = new Test($host, $user, $passwd, $db, $port, $socket);
+$my_test = new Test;
$my_test->foo();
var_dump($my_test->test);
?>
@@ -26,4 +25,4 @@
%s(3) "foo"
[1]=>
%s(3) "bar"
-}
\ No newline at end of file
+}
Modified: trunk/tests/ext/mysqli/bug31668.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug31668.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug31668.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
-Bug #31668 multi_query works exactly every other time (multi_query was global, now per
connection)
+Bug #31668 (multi_query works exactly every other time (multi_query was global, now per
connection))
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
@@ -16,7 +19,7 @@
}
$res->free();
}
- } while (@$mysql->next_result());
+ } while ($mysql->next_result());
var_dump($mysql->error, __LINE__);
$mysql->close();
@@ -30,48 +33,27 @@
}
$res->free();
}
- } while (@$mysql->next_result());
+ } while ($mysql->next_result());
var_dump($mysql->error, __LINE__);
?>
--EXPECTF--
array(1) {
[1]=>
- string(1) "1"
+ %s(1) "1"
}
array(1) {
[2]=>
- string(1) "2"
+ %s(1) "2"
}
-string(0) ""
+%s(0) ""
int(%d)
array(1) {
[1]=>
- string(1) "1"
+ %s(1) "1"
}
array(1) {
[2]=>
- string(1) "2"
+ %s(1) "2"
}
-string(0) ""
+%s(0) ""
int(%d)
---UEXPECTF--
-array(1) {
- [1]=>
- unicode(1) "1"
-}
-array(1) {
- [2]=>
- unicode(1) "2"
-}
-unicode(0) ""
-int(%d)
-array(1) {
- [1]=>
- unicode(1) "1"
-}
-array(1) {
- [2]=>
- unicode(1) "2"
-}
-unicode(0) ""
-int(%d)
\ No newline at end of file
Modified: trunk/tests/ext/mysqli/bug32405.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug32405.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug32405.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,18 +1,20 @@
--TEST--
-Bug #32405
+Bug #32405 (mysqli->fetch() is returning bad data)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include ("connect.inc");
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- mysqli_select_db($link, $db);
+ 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("DROP TABLE IF EXISTS test_users");
$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")');
@@ -28,25 +30,13 @@
mysqli_query($link,"DROP TABLE test_users");
mysqli_close($link);
- print "done!";
?>
--EXPECTF--
int(1)
-string(5) "user1"
+%s(5) "user1"
int(2)
-string(5) "user2"
+%s(5) "user2"
int(3)
-string(5) "user3"
+%s(5) "user3"
int(4)
-string(5) "user4"
-done!
---UEXPECTF--
-int(1)
-unicode(5) "user1"
-int(2)
-unicode(5) "user2"
-int(3)
-unicode(5) "user3"
-int(4)
-unicode(5) "user4"
-done!
\ No newline at end of file
+%s(5) "user4"
Modified: trunk/tests/ext/mysqli/bug33090.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug33090.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug33090.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,23 +1,24 @@
--TEST--
-Bug #33090
+Bug #33090 (mysql_prepare doesn't return an error)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include ("connect.inc");
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+ $link = mysqli_connect($host, $user, $passwd, null, $port, $socket);
mysqli_select_db($link, $db);
if (!($link->prepare("this makes no sense"))) {
printf("%d\n", $link->errno);
printf("%s\n", $link->sqlstate);
- }
+ }
$link->close();
- print "done!";
?>
--EXPECT--
1064
42000
-done!
\ No newline at end of file
Modified: trunk/tests/ext/mysqli/bug33263.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug33263.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug33263.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
-bug #33263 (mysqli_real_connect in __construct)
+Bug #33263 (mysqli_real_connect in __construct)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
@@ -20,15 +23,13 @@
$stmt = $mysql->prepare("SELECT DATABASE()");
$stmt->execute();
- $stmt->bind_result($database);
+ $stmt->bind_result($db);
$stmt->fetch();
$stmt->close();
- if ($db !== $database)
- printf("[001] Expecting string/%s got %s/%s\n", $db, gettype($database), $database);
+ var_dump($db);
$mysql->close();
- print "done!";
?>
--EXPECTF--
-done!
\ No newline at end of file
+%s(4) "test"
Modified: trunk/tests/ext/mysqli/bug33491.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug33491.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug33491.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -3,19 +3,22 @@
--INI--
error_reporting=4095
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
class DB extends mysqli
{
- public function query_single($query) {
- $result = parent::query($query);
- $result->fetch_row(); // <- Here be crash
- }
+ public function query_single($query) {
+ $result = parent::query($query);
+ $result->fetch_row(); // <- Here be crash
+ }
}
-require_once ("connect.inc");
+require_once("connect.inc");
// Segfault when using the DB class which extends mysqli
$DB = new DB($host, $user, $passwd, $db, $port, $socket);
Modified: trunk/tests/ext/mysqli/bug34785.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug34785.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug34785.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
-Bug #34785
+Bug #34785 (Can not properly subclass mysqli_stmt)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include ("connect.inc");
@@ -41,13 +44,7 @@
var_dump($row[0]);
mysqli_close($link);
- print "done!";
?>
--EXPECTF--
-string(3) "foo"
-string(3) "bar"
-done!
---UEXPECTF--
-unicode(3) "foo"
-unicode(3) "bar"
-done!
\ No newline at end of file
+%s(3) "foo"
+%s(3) "bar"
Modified: trunk/tests/ext/mysqli/bug34810.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug34810.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug34810.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,39 +1,42 @@
--TEST--
-bug #34810 (mysqli::init() and others use wrong $this pointer without checks)
+Bug #34810 (mysqli::init() and others use wrong $this pointer without checks)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
-class DbConnection {
+class DbConnection {
public function connect() {
include "connect.inc";
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
- var_dump($link);
-
+ var_dump($link);
+
$link = mysqli_init();
var_dump($link);
-
+
$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
$mysql->query("DROP TABLE IF EXISTS test_warnings");
$mysql->query("CREATE TABLE test_warnings (a int not null)");
$mysql->query("SET sql_mode=''");
$mysql->query("INSERT INTO test_warnings VALUES (1),(2),(NULL)");
var_dump(mysqli_warning::__construct($mysql));
- }
-}
+ }
+}
-$db = new DbConnection();
+$db = new DbConnection();
$db->connect();
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
object(mysqli)#%d (0) {
}
object(mysqli)#%d (0) {
}
object(mysqli_warning)#%d (0) {
}
-Done
\ No newline at end of file
+Done
Modified: trunk/tests/ext/mysqli/bug35103.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug35103.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug35103.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
-bug #35103 Bad handling of unsigned bigint
+Bug #35103 (Bad handling of unsigned bigint)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
@@ -19,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();
@@ -47,7 +50,6 @@
$mysql->multi_query($drop);
$mysql->close();
- print "done!";
?>
--EXPECT--
BIG INT SIGNED, TEST
@@ -67,4 +69,3 @@
9223372036854775807
9223372036854775808
18446744073709551615
-done!
\ No newline at end of file
Modified: trunk/tests/ext/mysqli/bug35517.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug35517.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug35517.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
-Bug #35517 mysqli_stmt_fetch returns NULL
+Bug #35517 (mysqli_stmt_fetch returns NULL)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
@@ -11,24 +14,19 @@
$mysql->query("CREATE TABLE temp (id INT UNSIGNED NOT NULL)");
$mysql->query("INSERT INTO temp (id) VALUES
(3000000897),(3800001532),(3900002281),(3100059612)");
- $expected_ids = array('3000000897', '3100059612', '3800001532', '3900002281', );
-
- $stmt = $mysql->prepare("SELECT id FROM temp ORDER BY id ASC");
+ $stmt = $mysql->prepare("SELECT id FROM temp");
$stmt->execute();
- $id = null;
$stmt->bind_result($id);
- $i = 0;
while ($stmt->fetch()) {
- if ($id != $expected_ids[$i]) {
- printf("[00%d] Expecting %s got %s/%s\n", $i, $expected_ids[$i], $id,
gettype($id));
- }
- $i++;
+ var_dump($id);
}
$stmt->close();
$mysql->query("DROP TABLE temp");
$mysql->close();
- print "done!";
?>
--EXPECTF--
-done!
\ No newline at end of file
+%s(10) "3000000897"
+%s(10) "3800001532"
+%s(10) "3900002281"
+%s(10) "3100059612"
Modified: trunk/tests/ext/mysqli/bug35759.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug35759.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug35759.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,13 +1,18 @@
--TEST--
-bug #35759 : mysqli_stmt_bind_result() makes huge allocation when column empty
+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--
<?php
$sql=<<<EOSQL
CREATE TABLE blobby (
a1 MEDIUMBLOB NOT NULL,
+
+
EOSQL;
include "connect.inc";
$col_num= 1000;
@@ -19,21 +24,18 @@
while (++$i < $col_num) {
$create .= ", a$i MEDIUMBLOB NOT NULL DEFAULT ''";
}
- $create .= ")";
-
- $mysql->query($create);
+ $create .= ")";
+
+ $mysql->query($create);
$mysql->query("INSERT INTO blobby (a0) VALUES ('')");
-
+
$stmt = $mysql->prepare("SELECT * FROM blobby");
$stmt->execute();
$stmt->store_result();
- for ($i = 0; $i < $col_num; $i++) {
- $params[] = &${"res_$i"};
- }
- $res = call_user_func_array(array($stmt, "bind_result"), $params);
- unset($res, $params);
+ $params= array_pad(array(), $col_num, "");
+ call_user_func_array(array($stmt, "bind_result"), $params);
$stmt->fetch();
-
+
$stmt->close();
$mysql->query("DROP TABLE blobby");
Modified: trunk/tests/ext/mysqli/bug36420.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug36420.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug36420.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
-bug #36420 (segfault when access result->num_rows after calling result->close())
+Bug #36420 (segfault when access result->num_rows after calling result->close())
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/bug36745.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug36745.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug36745.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
-bug #36745 : LOAD DATA LOCAL INFILE doesn't return correct error message
+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--
<?php
include ("connect.inc");
Modified: trunk/tests/ext/mysqli/bug36802.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug36802.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug36802.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,12 +1,12 @@
--TEST--
-bug #36802 : crashes with mysql_init
+Bug #36802 (crashes with with mysqli_set_charset())
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
class my_mysqli extends mysqli {
- function __construct()
+ function __construct()
{
}
}
@@ -24,11 +24,13 @@
}
$x[1] = @$mysql->query("SELECT 'foo' FROM DUAL");
- /* following operations should work */
+ /* following operations should work */
$x[2] = ($mysql->client_version > 0);
$x[3] = $mysql->errno;
$mysql->close();
+
+
var_dump($x);
?>
--EXPECT--
Modified: trunk/tests/ext/mysqli/bug36949.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug36949.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug36949.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,11 +1,13 @@
--TEST--
-bug #36949
+Bug #36949 (invalid internal mysqli objects dtor)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
-
class A {
private $mysqli;
@@ -44,9 +46,7 @@
$A = new A();
$B = new B();
-print "done!";
?>
--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>
-done!
\ No newline at end of file
Modified: trunk/tests/ext/mysqli/bug38003.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug38003.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug38003.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -7,14 +7,14 @@
class DB extends mysqli {
- private function __construct($hostname, $username, $password, $database) {
- var_dump("DB::__construct() called");
- }
+ private function __construct($hostname, $username, $password, $database) {
+ var_dump("DB::__construct() called");
+ }
}
$DB = new DB();
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
Fatal error: Call to private DB::__construct() from invalid context in %s on line %d
Modified: trunk/tests/ext/mysqli/bug38710.phpt
===================================================================
--- trunk/tests/ext/mysqli/bug38710.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/bug38710.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
Bug #38710 (data leakage because of nonexisting boundary checking in statements)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
@@ -12,11 +15,7 @@
$qry->execute();
$qry->bind_result($text);
$qry->fetch();
-if ($text !== str_repeat('a', ($IS_MYSQLND || mysqli_get_server_version($db) > 50110)?
100000:(mysqli_get_server_version($db)>=50000? 8193:8191))) {
- var_dump(strlen($text));
-}
-echo "Done";
-
+var_dump($text);
?>
---EXPECTF--
-Done
\ No newline at end of file
+--EXPECTF--
+string(8193)
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaa
aaaaaaaaaaaaaaaaaaaa"
Modified: trunk/tests/ext/mysqli/mysqli_affected_rows.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_affected_rows.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_affected_rows.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_affected_rows()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+ require_once('skipif.inc');
+ require_once('skipifemb.inc');
+ require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_affected_rows_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_affected_rows_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_affected_rows_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli->affected_rows
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+ require_once('skipif.inc');
+ require_once('skipifemb.inc');
+ require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_autocommit.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_autocommit.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_autocommit.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,9 +1,11 @@
--TEST--
mysqli_autocommit()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
-<?PHP
+<?php
+ require_once('skipif.inc');
+ require_once('skipifemb.inc');
+ require_once('skipifconnectfailure.inc');
+
if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
printf("skip Cannot connect to the server using host=%s, user=%s, passwd=***,
dbname=%s, port=%s, socket=%s\n",
$host, $user, $db, $port, $socket);
Modified: trunk/tests/ext/mysqli/mysqli_autocommit_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_autocommit_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_autocommit_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,9 +1,11 @@
--TEST--
mysqli->autocommit()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
-<?PHP
+<?php
+ require_once('skipif.inc');
+ require_once('skipifemb.inc');
+ require_once('skipifconnectfailure.inc');
+
if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) {
printf("skip Cannot connect to the server using host=%s, user=%s, passwd=***,
dbname=%s, port=%s, socket=%s\n",
$host, $user, $db, $port, $socket);
Modified: trunk/tests/ext/mysqli/mysqli_change_user.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_change_user.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_change_user.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_change_user()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_change_user_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_change_user_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_change_user_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,8 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+
require_once('table.inc');
if (!$IS_MYSQLND && (mysqli_get_server_version($link) < 50118 &&
mysqli_get_server_version($link) > 50100)) {
die("skip Your MySQL Server version has a known but that will cause a crash");
Modified: trunk/tests/ext/mysqli/mysqli_character_set.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_character_set.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_character_set.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,9 +1,12 @@
--TEST--
Fetching results from tables of different charsets.
--SKIPIF--
-<?php require_once('skipifunicode.inc'); ?>
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipifunicode.inc');
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_character_set_name.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_character_set_name.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_character_set_name.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_chararcter_set_name(), mysql_client_encoding() [alias]
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
/* NOTE: http://bugs.mysql.com/bug.php?id=7923 makes this test fail very likely on all
4.1.x - 5.0.x! */
Modified: trunk/tests/ext/mysqli/mysqli_character_set_name_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_character_set_name_oo.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_character_set_name_oo.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_chararcter_set_name(), mysql_client_encoding() [alias]
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+ require_once('skipif.inc');
+ require_once('skipifemb.inc');
+ require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
/* NOTE: http://bugs.mysql.com/bug.php?id=7923 makes this test fail very likely on all
4.1.x - 5.0.x! */
Modified: trunk/tests/ext/mysqli/mysqli_class_mysqli_interface.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_class_mysqli_interface.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_class_mysqli_interface.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
Interface of the class mysqli
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
require('connect.inc');
Modified: trunk/tests/ext/mysqli/mysqli_class_mysqli_result_interface.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_class_mysqli_result_interface.phpt 2007-08-07 16:24:15
UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_class_mysqli_result_interface.phpt 2007-08-08 11:05:20
UTC (rev 861)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_class_mysqli_result_reflection.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_class_mysqli_result_reflection.phpt 2007-08-07 16:24:15
UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_class_mysqli_result_reflection.phpt 2007-08-08 11:05:20
UTC (rev 861)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
require_once('connect.inc');
if (($tmp = substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.'))) && ($tmp < 5))
Modified: trunk/tests/ext/mysqli/mysqli_class_mysqli_stmt_interface.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_class_mysqli_stmt_interface.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_class_mysqli_stmt_interface.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -1,8 +1,11 @@
--TEST--
Interface of the class mysqli_stmt
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+ require_once('skipif.inc');
+ require_once('skipifemb.inc');
+ require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
require('connect.inc');
Modified: trunk/tests/ext/mysqli/mysqli_class_mysqli_warning.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_class_mysqli_warning.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_class_mysqli_warning.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
require_once('connect.inc');
if (!$TEST_EXPERIMENTAL)
Modified: trunk/tests/ext/mysqli/mysqli_close.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_close.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_close.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_close()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_close_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_close_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_close_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_close()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_commit.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_commit.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_commit.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,9 +1,11 @@
--TEST--
mysqli_commit()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
-<?PHP
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+
if (!$link = mysqli_connect($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",
$host, $user, $db, $port, $socket));
Modified: trunk/tests/ext/mysqli/mysqli_commit_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_commit_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_commit_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_commit()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
-<?PHP
+<?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",
$host, $user, $db, $port, $socket));
Modified: trunk/tests/ext/mysqli/mysqli_connect_errno.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_connect_errno.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_connect_errno.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_connect_errno()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_connect_error.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_connect_error.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_connect_error.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_connect_error()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_connect_oo_warnings.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_connect_oo_warnings.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_connect_oo_warnings.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,11 +1,13 @@
--TEST--
new mysqli()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
-<?php require_once('skipifnodefuser.inc');
-if (stristr(mysqli_get_client_info(), 'mysqlnd'))
- die("skip: test for libmysql (different error output when using php streams");
+<?php
+ require_once('skipif.inc');
+ require_once('skipifemb.inc');
+ require_once('skipifconnectfailure.inc');
+ require_once('skipifnodefuser.inc');
+ if (stristr(mysqli_get_client_info(), 'mysqlnd'))
+ die("skip: test for libmysql (different error output when using php streams");
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_connect_twice.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_connect_twice.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_connect_twice.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
Calling connect() on an open connection to create a new connection
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_constants.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_constants.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_constants.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
Constants exported by ext/mysqli
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
require("connect.inc");
Modified: trunk/tests/ext/mysqli/mysqli_data_seek.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_data_seek.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_data_seek.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_data_seek()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_data_seek_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_data_seek_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_data_seek_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_result->data_seek()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_debug.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_debug.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_debug.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,10 @@
--TEST--
mysqli_debug()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc');
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+
if (!function_exists('mysqli_debug'))
die("skip: mysqli_debug() not available");
?>
Modified: trunk/tests/ext/mysqli/mysqli_disable_reads_from_master.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_disable_reads_from_master.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_disable_reads_from_master.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -4,6 +4,8 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+
if (!function_exists('mysqli_disable_reads_from_master')) {
die("skip mysqli_disable_reads_from_master() not available");
}
Modified: trunk/tests/ext/mysqli/mysqli_disable_rpl_parse.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_disable_rpl_parse.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_disable_rpl_parse.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_disable_rpl_parse()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
-<?PHP
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_disable_rpl_parse'))
die("skip mysqli_disable_rpl_parse() not available");
?>
Modified: trunk/tests/ext/mysqli/mysqli_driver.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_driver.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_driver.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_driver class
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_dump_debug_info.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_dump_debug_info.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_dump_debug_info.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_dump_debug_info()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_dump_debug_info_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_dump_debug_info_oo.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_dump_debug_info_oo.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_dump_debug_info()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_embedded_connect.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_embedded_connect.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_embedded_connect.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_embedded_connect()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifnotemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifnotemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_enable_reads_from_master.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_enable_reads_from_master.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_enable_reads_from_master.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -1,9 +1,11 @@
--TEST--
mysqli_enable_reads_from_master()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
-<?PHP
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+
if (!function_exists('mysqli_enable_reads_from_master')) {
die("skip function mysqli_enable_reads_from_master() not available\n");
}
Modified: trunk/tests/ext/mysqli/mysqli_enable_rpl_parse.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_enable_rpl_parse.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_enable_rpl_parse.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,11 +1,12 @@
--TEST--
mysqli_enable_rpl_parse()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
-<?PHP
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_enable_rpl_parse'))
- die("skip mysqli_enable_rpl_parse() not available");
+ die("skip mysqli_enable_rpl_parse() not available");
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_errno.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_errno.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_errno.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_errno()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_errno_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_errno_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_errno_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
$mysqli->errno
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_error.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_error.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_error.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_error()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_error_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_error_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_error_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
$mysqli->error
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_error_unicode.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_error_unicode.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_error_unicode.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,14 +1,17 @@
--TEST--
mysqli_error()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
$tmp = NULL;
- $link = NULL;
+ $link = NULL;
if (!is_null($tmp = @mysqli_error()))
printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
Modified: trunk/tests/ext/mysqli/mysqli_explain_metadata.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_explain_metadata.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_explain_metadata.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
EXPLAIN - metadata
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
require_once('connect.inc');
Modified: trunk/tests/ext/mysqli/mysqli_fetch_all.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_all.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_all.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_fetch_all'))
die("skip: function only available with mysqlnd");
?>
Modified: trunk/tests/ext/mysqli/mysqli_fetch_all_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_all_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_all_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,8 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+
if (!function_exists('mysqli_fetch_all'))
die("skip: function only available with mysqlnd");
?>
Modified: trunk/tests/ext/mysqli/mysqli_fetch_array.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_array.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_array.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_array() - all datatypes but BIT
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_array_assoc.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_array_assoc.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_array_assoc.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_array()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_array_many_rows.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_array_many_rows.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_array_many_rows.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -2,8 +2,9 @@
mysqli_fetch_array()
--SKIPIF--
<?php
+require_once('skipif.inc');
require_once('skipifemb.inc');
-require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_fetch_array_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_array_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_array_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli->fetch_array()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_assoc.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_assoc.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_assoc.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_assoc()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_assoc_bit.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_assoc_bit.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_assoc_bit.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,8 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+ require_once('skipifconnectfailure.inc');
+
require_once('connect.inc');
require_once('table.inc');
if (mysqli_get_server_version($link) < 50003)
Modified: trunk/tests/ext/mysqli/mysqli_fetch_assoc_no_alias.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_assoc_no_alias.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_assoc_no_alias.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_assoc()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_assoc_no_alias_utf8.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_assoc_no_alias_utf8.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_assoc_no_alias_utf8.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+ require_once('skipifconnectfailure.inc');
require('connect.inc');
if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
Modified: trunk/tests/ext/mysqli/mysqli_fetch_assoc_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_assoc_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_assoc_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_assoc()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_field.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_field.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_field.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_field()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_field_direct.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_field_direct.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_field_direct.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_field_direct()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_field_direct_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_field_direct_oo.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_field_direct_oo.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
$res->fetch_field_direct(s)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_field_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_field_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_field_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_field()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_fields.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_fields.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_fields.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_fields()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_lengths.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_lengths.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_lengths.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_lengths()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_lengths_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_lengths_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_lengths_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_result->lengths
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_object.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_object.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_object.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_object()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include_once("connect.inc");
Modified: trunk/tests/ext/mysqli/mysqli_fetch_object_no_constructor.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_object_no_constructor.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_object_no_constructor.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_object() - calling constructor on class wo constructor
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_object_no_object.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_object_no_object.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_object_no_object.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_object()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_object_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_object_oo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_object_oo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_object()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fetch_row.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_row.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fetch_row.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_fetch_row()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_field_count.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_field_count.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_field_count.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_field_count()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_field_seek.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_field_seek.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_field_seek.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_field_seek()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
function mysqli_field_seek_flags($flags) {
Modified: trunk/tests/ext/mysqli/mysqli_field_tell.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_field_tell.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_field_tell.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_field_tell()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_fork.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fork.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_fork.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -2,8 +2,11 @@
Forking a child and using the same connection.
--SKIPIF--
<?php
+<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+
if (!function_exists('pcntl_fork'))
die("skip Process Control Functions not available");
Modified: trunk/tests/ext/mysqli/mysqli_free_result.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_free_result.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_free_result.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_free_result()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_get_cache_stats.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_cache_stats.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_get_cache_stats.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,7 @@
<?PHP
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_get_cache_stats')) {
die("skip only available with mysqlnd");
}
Modified: trunk/tests/ext/mysqli/mysqli_get_cache_stats_free_buffered.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_cache_stats_free_buffered.phpt 2007-08-07 16:24:15
UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_get_cache_stats_free_buffered.phpt 2007-08-08 11:05:20
UTC (rev 861)
@@ -4,6 +4,7 @@
<?PHP
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_get_cache_stats')) {
die("skip only available with mysqlnd");
}
Modified: trunk/tests/ext/mysqli/mysqli_get_charset.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_charset.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_get_charset.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,7 @@
<?php
require_once('skipifemb.inc');
require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_get_charset'))
die("skip: function not available");
?>
Modified: trunk/tests/ext/mysqli/mysqli_get_client_info.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_client_info.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_get_client_info.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_get_client_info()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_get_client_stats.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_client_stats.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_get_client_stats.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,7 @@
<?PHP
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_get_client_stats')) {
die("skip only available with mysqlnd");
}
Modified: trunk/tests/ext/mysqli/mysqli_get_client_version.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_client_version.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_get_client_version.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -4,11 +4,10 @@
<?php require_once('skipif.inc'); ?>
<?php require_once('skipifemb.inc'); ?>
--FILE--
-<?php
- include "connect.inc";
+<?php
if (!is_int($info = mysqli_get_client_version()) || ($info < 100))
printf("[001] Expecting int/any_non_empty, got %s/%s\n", gettype($info), $info);
-
+
print "done!";
?>
--EXPECTF--
Modified: trunk/tests/ext/mysqli/mysqli_get_connection_stats.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_connection_stats.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_get_connection_stats.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -4,6 +4,7 @@
<?PHP
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_get_connection_stats')) {
die("skip only available with mysqlnd");
}
Modified: trunk/tests/ext/mysqli/mysqli_get_host_info.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_host_info.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_get_host_info.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_get_host_info()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_get_proto_info.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_proto_info.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_get_proto_info.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_get_proto_info()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_get_server_info.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_server_info.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_get_server_info.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_get_server_info()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_get_server_version.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_server_version.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_get_server_version.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_get_server_version()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_get_warnings.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_warnings.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_get_warnings.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
require_once('connect.inc');
if (!$TEST_EXPERIMENTAL)
die("skip - experimental (= unsupported) feature");
Modified: trunk/tests/ext/mysqli/mysqli_info.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_info.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_info.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_info()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_init.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_init.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_init.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_init()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
$link = mysqli_init();
Modified: trunk/tests/ext/mysqli/mysqli_insert_id.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_insert_id.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_insert_id.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_insert_id()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_kill.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_kill.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_kill.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_kill()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_more_results.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_more_results.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_more_results.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_more_results()
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_multi_query.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_multi_query.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_multi_query.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_multi_query()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_mysqli_result_invalid_mode.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_mysqli_result_invalid_mode.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_mysqli_result_invalid_mode.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_result(), invalid mode
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
require('connect.inc');
Modified: trunk/tests/ext/mysqli/mysqli_next_result.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_next_result.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_next_result.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_next_result()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_num_fields.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_num_fields.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_num_fields.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_num_fields()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_num_rows.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_num_rows.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_num_rows.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_num_rows()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_options.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_options.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_options.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_options()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_options_init_command.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_options_init_command.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_options_init_command.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,9 +1,11 @@
--TEST--
mysqli_options()
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+
die("skip - STUB - TODO - this is a stub to remind me that we should also actually test
the options");
?>
<?php require_once('skipifemb.inc'); ?>
Modified: trunk/tests/ext/mysqli/mysqli_pconnect.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_pconnect.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_pconnect.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+quire_once('skipifconnectfailure.inc');
if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
die("skip: only available in mysqlnd");
Modified: trunk/tests/ext/mysqli/mysqli_phpinfo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_phpinfo.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_phpinfo.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
phpinfo() mysqli section
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include("connect.inc");
Modified: trunk/tests/ext/mysqli/mysqli_ping.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_ping.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_ping.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_ping()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_prepare.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_prepare.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_prepare.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_prepare()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_prepare_no_object.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_prepare_no_object.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_prepare_no_object.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_prepare() - no object on failure
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_query.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_query.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_query.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_query()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_query_unicode.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_query_unicode.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_query_unicode.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
require_once('connect.inc');
require_once('table.inc');
if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE 'utf8'"))
Modified: trunk/tests/ext/mysqli/mysqli_real_connect.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_real_connect.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_real_connect.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_real_connect()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--INI--
open_basedir=.
--FILE--
Modified: trunk/tests/ext/mysqli/mysqli_real_escape_string.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_real_escape_string.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_real_escape_string.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_real_escape_string()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_real_escape_string_unicode.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_real_escape_string_unicode.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_real_escape_string_unicode.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_real_escape_string()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_real_query.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_real_query.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_real_query.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,7 +1,10 @@
--TEST--
mysqli_real_query()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_report.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_report.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_report.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_report()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_report_wo_ps.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_report_wo_ps.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_report_wo_ps.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_report()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_result_references.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_result_references.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_result_references.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
References to result sets
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
require_once('connect.inc');
Modified: trunk/tests/ext/mysqli/mysqli_result_references_mysqlnd.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_result_references_mysqlnd.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_result_references_mysqlnd.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -4,6 +4,8 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+
require_once('connect.inc');
if (!$IS_MYSQLND)
die("skip Test for mysqlnd only");
Modified: trunk/tests/ext/mysqli/mysqli_result_unclonable.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_result_unclonable.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_result_unclonable.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
Trying to clone mysqli_result object
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_rollback.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_rollback.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_rollback.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -6,6 +6,8 @@
<?PHP
require_once('skipif.inc');
require_once('skipifemb.inc');
+ require_once('skipifconnectfailure.inc');
+
require_once('connect.inc');
if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
Modified: trunk/tests/ext/mysqli/mysqli_select_db.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_select_db.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_select_db.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_select_db()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_set_charset.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_charset.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_charset.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,9 +1,11 @@
--TEST--
mysqli_set_charset()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php
-require_once('skipifemb.inc');
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+
if (!function_exists('mysqli_set_charset'))
die("skip Function not available");
if (ini_get("unicode.semantics"))
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_default.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_default.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_default.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_default()
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler()
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
require_once('connect.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_bad_character.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_bad_character.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_bad_character.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler() - random ASCII character including \0
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
require_once('connect.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_buffer_overflow.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_buffer_overflow.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_buffer_overflow.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler() - buffer overflow
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_close_link.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_close_link.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_close_link.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler() - close database link
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_closefile.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_closefile.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_closefile.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler() - do not use the file pointer
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_kill_link.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_kill_link.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_kill_link.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler() - kill database link
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_negative_len.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_negative_len.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_negative_len.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler() - negative return value/buflen to indicate an error
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nested_call.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nested_call.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nested_call.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler() - nested calls
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_new_query.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_new_query.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_new_query.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler() - run new query on db link
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nofileop.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nofileop.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_nofileop.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler() - do not use the file pointer
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_replace_buffer.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_replace_buffer.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_replace_buffer.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler() - replace buffer pointer
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_short_len.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_short_len.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_short_len.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler() - report shorter buffer
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
Modified: trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_unregister.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_unregister.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_local_infile_handler_unregister.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_set_local_infile_handler() - do not use the file pointer
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
-require_once('skipifemb.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
Modified: trunk/tests/ext/mysqli/mysqli_set_opt.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_opt.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_opt.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_set_opt()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -2,9 +2,11 @@
mysqli_set_opt() - MYSQLI_OPT_NUMERIC_AND_DATETIME_AS_UNICODE
--SKIPIF--
<?php
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
-require_once('skipif.inc');
-require_once('skipifemb.inc');
if (!function_exists('unicode_semantics'))
die("skip needs PHP 6");
if (!unicode_semantics())
Modified: trunk/tests/ext/mysqli/mysqli_sqlstate.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_sqlstate.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_sqlstate.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_sqlstate()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_ssl_set.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_ssl_set.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_ssl_set.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,9 +1,10 @@
--TEST--
mysqli_ssl_set() - test is a stub!
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php
-require_once('skipifemb.inc');
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_ssl_set'))
die("skip function not available");
?>
Modified: trunk/tests/ext/mysqli/mysqli_stat.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stat.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stat.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stat()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_affected_rows.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_affected_rows.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_affected_rows.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_affected_rows()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_attr_get.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_attr_get.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_attr_get.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_attr_get()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_attr_get_prefetch.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_attr_get_prefetch.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_attr_get_prefetch.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,9 +1,12 @@
--TEST--
mysqli_stmt_attr_get() - prefetch
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
-<?php die("SKIP: prefetch isn't supported at the moment") ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+die("SKIP: prefetch isn't supported at the moment");
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_attr_set.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_attr_set.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_attr_set.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_attr_set()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_bind_param.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_bind_param.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_bind_param.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_bind_param()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
/*
Modified: trunk/tests/ext/mysqli/mysqli_stmt_bind_param_references.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_bind_param_references.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_bind_param_references.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_bind_param() - playing with references
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_bind_param_type_juggling.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_bind_param_type_juggling.phpt 2007-08-07 16:24:15
UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_bind_param_type_juggling.phpt 2007-08-08 11:05:20
UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_bind_param() - binding variable twice
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_bind_result.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_bind_result.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_bind_result.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_bind_result()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_bind_result_references.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_bind_result_references.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_bind_result_references.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_bind_result() - playing with references
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_close.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_close.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_close.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_close()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_data_seek.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_data_seek.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_data_seek.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_data_seek()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_errno.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_errno.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_errno.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_errno()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_error.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_error.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_error.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_error()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_execute.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_execute.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_execute.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_execute()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_fetch.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_fetch.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_fetch.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_fetch()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
/*
Modified: trunk/tests/ext/mysqli/mysqli_stmt_fetch_bit.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_fetch_bit.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_fetch_bit.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+ require_once('skipifconnectfailure.inc');
require_once('connect.inc');
require_once('table.inc');
if (mysqli_get_server_version($link) < 50003)
Modified: trunk/tests/ext/mysqli/mysqli_stmt_fetch_fields_win32_unicode.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_fetch_fields_win32_unicode.phpt 2007-08-07 16:24:15
UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_fetch_fields_win32_unicode.phpt 2007-08-08 11:05:20
UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_fetch_fields() unicode, win32
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_field_count.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_field_count.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_field_count.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_field_counts()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_free_result.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_free_result.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_free_result.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_free_result()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
/*
Modified: trunk/tests/ext/mysqli/mysqli_stmt_get_result.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_get_result.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_get_result.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,7 @@
<?php
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');
Modified: trunk/tests/ext/mysqli/mysqli_stmt_get_result2.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_get_result2.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_get_result2.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,9 +1,13 @@
--TEST--
mysqli_stmt_get_result()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
-<?php if (!function_exists('mysqli_stmt_get_result')) die('skip mysqli_stmt_get_result
not available')?>
+<?php
+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');
+?>
--FILE--
<?php
/*
Modified: trunk/tests/ext/mysqli/mysqli_stmt_get_result_bit.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_get_result_bit.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_get_result_bit.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -4,6 +4,7 @@
<?php
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");
Modified: trunk/tests/ext/mysqli/mysqli_stmt_get_result_field_count.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_get_result_field_count.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_get_result_field_count.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -2,11 +2,12 @@
mysqli_stmt_get_result() - meta data, field_count()
--SKIPIF--
<?php
-require_once('skipif.inc');
-require_once('skipifemb.inc');
-
-if (!function_exists('mysqli_stmt_get_result'))
- die('skip mysqli_stmt_get_result not available')
+ 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');
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_stmt_get_result_metadata.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_get_result_metadata.phpt 2007-08-07 16:24:15 UTC
(rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_get_result_metadata.phpt 2007-08-08 11:05:20 UTC
(rev 861)
@@ -4,6 +4,7 @@
<?php
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');
Modified: trunk/tests/ext/mysqli/mysqli_stmt_get_result_metadata_fetch_field.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_get_result_metadata_fetch_field.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_get_result_metadata_fetch_field.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -4,6 +4,7 @@
<?php
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');
Modified: trunk/tests/ext/mysqli/mysqli_stmt_get_result_seek.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_get_result_seek.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_get_result_seek.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -4,6 +4,7 @@
<?php
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');
Modified: trunk/tests/ext/mysqli/mysqli_stmt_get_warnings.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_get_warnings.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_get_warnings.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
require_once('connect.inc');
if (!$TEST_EXPERIMENTAL)
Modified: trunk/tests/ext/mysqli/mysqli_stmt_init.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_init.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_init.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_init()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
/*
Modified: trunk/tests/ext/mysqli/mysqli_stmt_insert_id.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_insert_id.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_insert_id.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_insert_id()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_num_rows.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_num_rows.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_num_rows.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_num_rows()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_param_count.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_param_count.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_param_count.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_param_count()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_prepare.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_prepare.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_prepare.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_prepare()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_reset.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_reset.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_reset.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_reset()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_result_metadata.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_result_metadata.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_result_metadata.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_result_metadata()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_result_metadata_sqltests.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_result_metadata_sqltests.phpt 2007-08-07 16:24:15
UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_result_metadata_sqltests.phpt 2007-08-08 11:05:20
UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_result_metadata() - non SELECT statements
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_send_long_data.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_send_long_data.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_send_long_data.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_send_long_data()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_libmysql.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_libmysql.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,11 @@
--TEST--
mysqli_stmt_send_long_data() - exceed packet size, libmysql - bug #26824
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
<?php
+require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+
if (stristr(mysqli_get_client_info(), 'mysqlnd'))
die("skip: test for libmysql");
?>
Modified: trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt 2007-08-07
16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt 2007-08-08
11:05:20 UTC (rev 861)
@@ -1,9 +1,11 @@
--TEST--
mysqli_stmt_send_long_data() - exceed packet size, mysqlnd
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
<?php
+require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+
if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
die("skip: warnings only available in mysqlnd");
?>
Modified: trunk/tests/ext/mysqli/mysqli_stmt_sqlstate.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_sqlstate.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_sqlstate.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_stmt_sqlstate()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_stmt_store_result.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_store_result.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_store_result.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
Modified: trunk/tests/ext/mysqli/mysqli_stmt_unclonable.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_unclonable.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_stmt_unclonable.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
Trying to clone mysqli_stmt object
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_store_result.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_store_result.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_store_result.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_store_result()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_thread_id.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_thread_id.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_thread_id.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_thread_id()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_thread_safe.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_thread_safe.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_thread_safe.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,10 @@
--TEST--
mysqli_thread_safe()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+?>
--FILE--
<?php
if (!is_bool($tmp = mysqli_thread_safe()))
Modified: trunk/tests/ext/mysqli/mysqli_unclonable.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_unclonable.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_unclonable.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
Trying to clone mysqli object
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_use_result.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_use_result.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_use_result.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_use_result()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_warning_count.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_warning_count.phpt 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/mysqli_warning_count.phpt 2007-08-08 11:05:20 UTC (rev 861)
@@ -1,8 +1,11 @@
--TEST--
mysqli_warning_count()
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
Modified: trunk/tests/ext/mysqli/mysqli_warning_unclonable.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_warning_unclonable.phpt 2007-08-07 16:24:15 UTC (rev
860)
+++ trunk/tests/ext/mysqli/mysqli_warning_unclonable.phpt 2007-08-08 11:05:20 UTC (rev
861)
@@ -4,6 +4,7 @@
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
require_once('connect.inc');
if (!$TEST_EXPERIMENTAL)
die("skip - experimental (= unsupported) feature");
Added: trunk/tests/ext/mysqli/skipifconnectfailure.inc
===================================================================
--- trunk/tests/ext/mysqli/skipifconnectfailure.inc 2007-08-07 16:24:15 UTC (rev 860)
+++ trunk/tests/ext/mysqli/skipifconnectfailure.inc 2007-08-08 11:05:20 UTC (rev 861)
@@ -0,0 +1,10 @@
+<?php
+$skip_on_connect_failure = getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") ?
getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") : false;
+if ($skip_on_connect_failure) {
+ include_once('connect.inc');
+ $link = @mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+ if (!is_object($link))
+ die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(),
mysqli_connect_error()));
+ mysqli_close($link);
+}
+?>
Property changes on: trunk/tests/ext/mysqli/skipifconnectfailure.inc
___________________________________________________________________
Name: svn:executable
+ *
| Thread |
|---|
| • PHP mysqlnd svn commit: r861 - in trunk/tests/ext/mysqli: . bench/framework | uwendel | 8 Aug |
