diff options
73 files changed, 293 insertions, 83 deletions
diff --git a/ext/mysqli/tests/001.phpt b/ext/mysqli/tests/001.phpt index 1e76695d4f..77f3dcbd18 100644 --- a/ext/mysqli/tests/001.phpt +++ b/ext/mysqli/tests/001.phpt @@ -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"; diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt index bfec8c7aca..a0d4b878f0 100644 --- a/ext/mysqli/tests/002.phpt +++ b/ext/mysqli/tests/002.phpt @@ -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"; diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt index dcbb6acce7..d80ed417ec 100644 --- a/ext/mysqli/tests/003.phpt +++ b/ext/mysqli/tests/003.phpt @@ -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"; diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt index ac443ffa60..1080d0ea9e 100644 --- a/ext/mysqli/tests/004.phpt +++ b/ext/mysqli/tests/004.phpt @@ -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"); diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt index 9ba085abca..ce53929e0d 100644 --- a/ext/mysqli/tests/005.phpt +++ b/ext/mysqli/tests/005.phpt @@ -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"; diff --git a/ext/mysqli/tests/006.phpt b/ext/mysqli/tests/006.phpt index d63a6fa41a..43853ecebc 100644 --- a/ext/mysqli/tests/006.phpt +++ b/ext/mysqli/tests/006.phpt @@ -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"; diff --git a/ext/mysqli/tests/007.phpt b/ext/mysqli/tests/007.phpt index fa1bab92ed..db8070a5bb 100644 --- a/ext/mysqli/tests/007.phpt +++ b/ext/mysqli/tests/007.phpt @@ -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"; diff --git a/ext/mysqli/tests/008.phpt b/ext/mysqli/tests/008.phpt index c2627befcc..da4ae7dd8d 100644 --- a/ext/mysqli/tests/008.phpt +++ b/ext/mysqli/tests/008.phpt @@ -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"; diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt index f0b5ae2f01..e018d9302b 100644 --- a/ext/mysqli/tests/009.phpt +++ b/ext/mysqli/tests/009.phpt @@ -7,6 +7,7 @@ mysqli fetch bigint values (ok to fail with 4.1.x) exit; } require_once('skipif.inc'); + require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt index 8f24812833..ea9bb2882f 100644 --- a/ext/mysqli/tests/010.phpt +++ b/ext/mysqli/tests/010.phpt @@ -3,7 +3,10 @@ mysqli fetch float values --INI-- precision=12 --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include "connect.inc"; diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt index e6d9492c80..16de67736e 100644 --- a/ext/mysqli/tests/011.phpt +++ b/ext/mysqli/tests/011.phpt @@ -3,7 +3,10 @@ mysqli fetch mixed values --INI-- precision=12 --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include "connect.inc"; diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt index fafe2a0ee2..d0c92f67ce 100644 --- a/ext/mysqli/tests/012.phpt +++ b/ext/mysqli/tests/012.phpt @@ -3,7 +3,10 @@ mysqli fetch mixed values 2 --INI-- precision=12 --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include "connect.inc"; diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt index a0b3b2b6a1..88c8e0d588 100644 --- a/ext/mysqli/tests/013.phpt +++ b/ext/mysqli/tests/013.phpt @@ -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"; diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt index 7d21deb6c1..93c2adca18 100644 --- a/ext/mysqli/tests/014.phpt +++ b/ext/mysqli/tests/014.phpt @@ -3,6 +3,7 @@ mysqli autocommit/commit/rollback --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'")) { diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt index db0d997fa1..f68e9aa72a 100644 --- a/ext/mysqli/tests/015.phpt +++ b/ext/mysqli/tests/015.phpt @@ -3,6 +3,7 @@ mysqli autocommit/commit/rollback with innodb --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'"); diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt index 7989bd330a..3e058ea69c 100644 --- a/ext/mysqli/tests/016.phpt +++ b/ext/mysqli/tests/016.phpt @@ -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"; diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt index 912d5e28c3..1fe24aa3be 100644 --- a/ext/mysqli/tests/017.phpt +++ b/ext/mysqli/tests/017.phpt @@ -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"; diff --git a/ext/mysqli/tests/018.phpt b/ext/mysqli/tests/018.phpt index f62c52a3dd..c5c60c7ae6 100644 --- a/ext/mysqli/tests/018.phpt +++ b/ext/mysqli/tests/018.phpt @@ -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"; diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt index 2fdc797e92..5db5eb0e78 100644 --- a/ext/mysqli/tests/019.phpt +++ b/ext/mysqli/tests/019.phpt @@ -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"; diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt index cc33d2e4fd..ac3434bf5e 100644 --- a/ext/mysqli/tests/020.phpt +++ b/ext/mysqli/tests/020.phpt @@ -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 diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt index b9f367afda..f2737ad81a 100644 --- a/ext/mysqli/tests/021.phpt +++ b/ext/mysqli/tests/021.phpt @@ -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"; diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt index 969936ed8a..14ea46eea6 100644 --- a/ext/mysqli/tests/022.phpt +++ b/ext/mysqli/tests/022.phpt @@ -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"; diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt index d7bf23db72..0137f9e373 100644 --- a/ext/mysqli/tests/023.phpt +++ b/ext/mysqli/tests/023.phpt @@ -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"; diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt index 414a5a2b4b..167cb428e3 100644 --- a/ext/mysqli/tests/024.phpt +++ b/ext/mysqli/tests/024.phpt @@ -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"; diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt index 9cf0351ce3..7d31342fec 100644 --- a/ext/mysqli/tests/025.phpt +++ b/ext/mysqli/tests/025.phpt @@ -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"; diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt index 04faf108c6..ac728872a4 100644 --- a/ext/mysqli/tests/026.phpt +++ b/ext/mysqli/tests/026.phpt @@ -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"; diff --git a/ext/mysqli/tests/027.phpt b/ext/mysqli/tests/027.phpt index dc0f1af928..c52c73e619 100644 --- a/ext/mysqli/tests/027.phpt +++ b/ext/mysqli/tests/027.phpt @@ -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 @@ function test: mysqli_stat $status = mysqli_stat($link); - var_dump(strlen($status) > 0); mysqli_close($link); diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt index 44704dcae0..83ea67f342 100644 --- a/ext/mysqli/tests/028.phpt +++ b/ext/mysqli/tests/028.phpt @@ -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"; diff --git a/ext/mysqli/tests/029.phpt b/ext/mysqli/tests/029.phpt index 4970736f2a..8e1a922dfc 100644 --- a/ext/mysqli/tests/029.phpt +++ b/ext/mysqli/tests/029.phpt @@ -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"; diff --git a/ext/mysqli/tests/030.phpt b/ext/mysqli/tests/030.phpt index cd48edc312..f00c28fd8e 100644 --- a/ext/mysqli/tests/030.phpt +++ b/ext/mysqli/tests/030.phpt @@ -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"; diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt index 9ece3830da..c6ebbe3e40 100644 --- a/ext/mysqli/tests/031.phpt +++ b/ext/mysqli/tests/031.phpt @@ -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"; diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt index d398b3703f..f902e1d000 100644 --- a/ext/mysqli/tests/032.phpt +++ b/ext/mysqli/tests/032.phpt @@ -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"; diff --git a/ext/mysqli/tests/033.phpt b/ext/mysqli/tests/033.phpt index fff4be4d3a..7113b22ccb 100644 --- a/ext/mysqli/tests/033.phpt +++ b/ext/mysqli/tests/033.phpt @@ -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"; diff --git a/ext/mysqli/tests/034.phpt b/ext/mysqli/tests/034.phpt index a381ecad82..c195d7bff3 100644 --- a/ext/mysqli/tests/034.phpt +++ b/ext/mysqli/tests/034.phpt @@ -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"; diff --git a/ext/mysqli/tests/035.phpt b/ext/mysqli/tests/035.phpt index 0eeb5bfea3..58f0246dfb 100644 --- a/ext/mysqli/tests/035.phpt +++ b/ext/mysqli/tests/035.phpt @@ -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"; diff --git a/ext/mysqli/tests/036.phpt b/ext/mysqli/tests/036.phpt index f1a2114352..6bbcd7da1b 100644 --- a/ext/mysqli/tests/036.phpt +++ b/ext/mysqli/tests/036.phpt @@ -7,6 +7,7 @@ function test: mysqli_insert_id() exit; } require_once('skipif.inc'); + require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php diff --git a/ext/mysqli/tests/037.phpt b/ext/mysqli/tests/037.phpt index f1aa63e84a..a7c218c2c5 100644 --- a/ext/mysqli/tests/037.phpt +++ b/ext/mysqli/tests/037.phpt @@ -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 diff --git a/ext/mysqli/tests/038.phpt b/ext/mysqli/tests/038.phpt index 0e4fb435c9..297e1d3989 100644 --- a/ext/mysqli/tests/038.phpt +++ b/ext/mysqli/tests/038.phpt @@ -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 diff --git a/ext/mysqli/tests/039.phpt b/ext/mysqli/tests/039.phpt index 805b2aadff..60b4a711e1 100644 --- a/ext/mysqli/tests/039.phpt +++ b/ext/mysqli/tests/039.phpt @@ -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 diff --git a/ext/mysqli/tests/040.phpt b/ext/mysqli/tests/040.phpt index 18a42185f3..fa1754a562 100644 --- a/ext/mysqli/tests/040.phpt +++ b/ext/mysqli/tests/040.phpt @@ -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 diff --git a/ext/mysqli/tests/041.phpt b/ext/mysqli/tests/041.phpt index 7b750d6ecc..81bd808c4b 100644 --- a/ext/mysqli/tests/041.phpt +++ b/ext/mysqli/tests/041.phpt @@ -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 diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt index acc262992a..bb622b3e30 100644 --- a/ext/mysqli/tests/042.phpt +++ b/ext/mysqli/tests/042.phpt @@ -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"; @@ -14,12 +17,12 @@ mysqli_fetch_object mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 smallint unsigned, - c2 smallint unsigned, - c3 smallint, - c4 smallint, - c5 smallint, - c6 smallint unsigned, - c7 smallint)"); + c2 smallint unsigned, + c3 smallint, + c4 smallint, + c5 smallint, + c6 smallint unsigned, + c7 smallint)"); $stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?,?,?,?,?,?)"); mysqli_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7); diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt index 20fb52a9e7..b5038ffb2a 100644 --- a/ext/mysqli/tests/043.phpt +++ b/ext/mysqli/tests/043.phpt @@ -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"; diff --git a/ext/mysqli/tests/044.phpt b/ext/mysqli/tests/044.phpt index 9a5069ec80..0a2495b9cf 100644 --- a/ext/mysqli/tests/044.phpt +++ b/ext/mysqli/tests/044.phpt @@ -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"; diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt index 62c348bc75..ca916b0d32 100644 --- a/ext/mysqli/tests/045.phpt +++ b/ext/mysqli/tests/045.phpt @@ -4,11 +4,11 @@ mysqli_bind_result (SHOW) <?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); diff --git a/ext/mysqli/tests/046.phpt b/ext/mysqli/tests/046.phpt index 7916c24d30..9fcf321eef 100644 --- a/ext/mysqli/tests/046.phpt +++ b/ext/mysqli/tests/046.phpt @@ -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"; diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt index 3715ba2b05..a32dd70edf 100644 --- a/ext/mysqli/tests/047.phpt +++ b/ext/mysqli/tests/047.phpt @@ -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"; diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt index 8da3e4544d..afd4799b83 100644 --- a/ext/mysqli/tests/048.phpt +++ b/ext/mysqli/tests/048.phpt @@ -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"; diff --git a/ext/mysqli/tests/049.phpt b/ext/mysqli/tests/049.phpt index 8e458b386f..5be8b40f3b 100644 --- a/ext/mysqli/tests/049.phpt +++ b/ext/mysqli/tests/049.phpt @@ -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"; diff --git a/ext/mysqli/tests/050.phpt b/ext/mysqli/tests/050.phpt index 1e3fd6403a..ee1c20322e 100644 --- a/ext/mysqli/tests/050.phpt +++ b/ext/mysqli/tests/050.phpt @@ -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"; diff --git a/ext/mysqli/tests/051.phpt b/ext/mysqli/tests/051.phpt index 72b8618319..8ff75d59bf 100644 --- a/ext/mysqli/tests/051.phpt +++ b/ext/mysqli/tests/051.phpt @@ -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"; diff --git a/ext/mysqli/tests/052.phpt b/ext/mysqli/tests/052.phpt index 24b9db94bd..95fdc2f27c 100644 --- a/ext/mysqli/tests/052.phpt +++ b/ext/mysqli/tests/052.phpt @@ -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"; diff --git a/ext/mysqli/tests/053.phpt b/ext/mysqli/tests/053.phpt index 5f1de890b5..5a60b0fc01 100644 --- a/ext/mysqli/tests/053.phpt +++ b/ext/mysqli/tests/053.phpt @@ -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"; diff --git a/ext/mysqli/tests/054.phpt b/ext/mysqli/tests/054.phpt index 756c008fc9..969ae7a1f1 100644 --- a/ext/mysqli/tests/054.phpt +++ b/ext/mysqli/tests/054.phpt @@ -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"; diff --git a/ext/mysqli/tests/055.phpt b/ext/mysqli/tests/055.phpt index 0c30a31304..1d0f6c9df6 100644 --- a/ext/mysqli/tests/055.phpt +++ b/ext/mysqli/tests/055.phpt @@ -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"; diff --git a/ext/mysqli/tests/056.phpt b/ext/mysqli/tests/056.phpt index e723c6158a..e8669dc32f 100644 --- a/ext/mysqli/tests/056.phpt +++ b/ext/mysqli/tests/056.phpt @@ -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"; diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt index 063126560a..1bb17b6961 100644 --- a/ext/mysqli/tests/057.phpt +++ b/ext/mysqli/tests/057.phpt @@ -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"; diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt index b602b55cd5..32a735322d 100644 --- a/ext/mysqli/tests/058.phpt +++ b/ext/mysqli/tests/058.phpt @@ -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"; diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt index 8ad4d86a08..b56dc26e2a 100644 --- a/ext/mysqli/tests/059.phpt +++ b/ext/mysqli/tests/059.phpt @@ -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"; diff --git a/ext/mysqli/tests/060.phpt b/ext/mysqli/tests/060.phpt index d77dca0342..52af2605c8 100644 --- a/ext/mysqli/tests/060.phpt +++ b/ext/mysqli/tests/060.phpt @@ -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"; diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt index f0422ec6f7..0618c3a703 100644 --- a/ext/mysqli/tests/061.phpt +++ b/ext/mysqli/tests/061.phpt @@ -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"; diff --git a/ext/mysqli/tests/062.phpt b/ext/mysqli/tests/062.phpt index 652f5cf47f..9a4166973c 100644 --- a/ext/mysqli/tests/062.phpt +++ b/ext/mysqli/tests/062.phpt @@ -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"; diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt index 9aedbc8d7f..26acae09c0 100644 --- a/ext/mysqli/tests/063.phpt +++ b/ext/mysqli/tests/063.phpt @@ -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"; diff --git a/ext/mysqli/tests/064.phpt b/ext/mysqli/tests/064.phpt index 6cdd3c6dac..729fb6b45f 100644 --- a/ext/mysqli/tests/064.phpt +++ b/ext/mysqli/tests/064.phpt @@ -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"; diff --git a/ext/mysqli/tests/065.phpt b/ext/mysqli/tests/065.phpt index 8f24152cfe..705b0e423b 100644 --- a/ext/mysqli/tests/065.phpt +++ b/ext/mysqli/tests/065.phpt @@ -3,6 +3,8 @@ set character set --SKIPIF-- <?php require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); + if (!function_exists('mysqli_set_charset')) { die('skip mysqli_set_charset() not available'); } diff --git a/ext/mysqli/tests/066.phpt b/ext/mysqli/tests/066.phpt index 33ae64d5c6..95c8c576f0 100644 --- a/ext/mysqli/tests/066.phpt +++ b/ext/mysqli/tests/066.phpt @@ -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 diff --git a/ext/mysqli/tests/067.phpt b/ext/mysqli/tests/067.phpt index b7e457f298..da372607cb 100644 --- a/ext/mysqli/tests/067.phpt +++ b/ext/mysqli/tests/067.phpt @@ -3,22 +3,22 @@ function test: nested selects (cursors) --SKIPIF-- <?php require_once('skipif.inc'); + require_once('skipifconnectfailure.inc'); include "connect.inc"; if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to check required version"); /* skip cursor test for versions < 50004 */ - if ((!$IS_MYSQLND && mysqli_get_client_version() < 50009) || + if ((!$IS_MYSQLND && (mysqli_get_client_version() < 50009)) || (mysqli_get_server_version($link) < 50009)) { die(sprintf("skip Client library doesn't support cursors (%s/%s)", - mysqli_get_client_version(), mysqli_get_server_version($link)); + mysqli_get_client_version(), mysqli_get_server_version($link))); } mysqli_close($link); ?> --FILE-- <?php - function open_cursor($mysql, $query) { if (!is_object($stmt = $mysql->prepare($query))) { printf("[001] Cannot create statement object for '%s', [%d] %s\n", diff --git a/ext/mysqli/tests/069.phpt b/ext/mysqli/tests/069.phpt index 4088fe50b8..f63cdd715c 100644 --- a/ext/mysqli/tests/069.phpt +++ b/ext/mysqli/tests/069.phpt @@ -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"; diff --git a/ext/mysqli/tests/070.phpt b/ext/mysqli/tests/070.phpt index dd666cc09a..3064ac11e7 100644 --- a/ext/mysqli/tests/070.phpt +++ b/ext/mysqli/tests/070.phpt @@ -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"; diff --git a/ext/mysqli/tests/071.phpt b/ext/mysqli/tests/071.phpt index 365e2a8034..e2fcaf18ae 100644 --- a/ext/mysqli/tests/071.phpt +++ b/ext/mysqli/tests/071.phpt @@ -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"; diff --git a/ext/mysqli/tests/072.phpt b/ext/mysqli/tests/072.phpt index df473f6f4f..23b474980a 100644 --- a/ext/mysqli/tests/072.phpt +++ b/ext/mysqli/tests/072.phpt @@ -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"; diff --git a/ext/mysqli/tests/074.phpt b/ext/mysqli/tests/074.phpt index 794f3572d5..d3765f9a2a 100644 --- a/ext/mysqli/tests/074.phpt +++ b/ext/mysqli/tests/074.phpt @@ -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 diff --git a/ext/mysqli/tests/skipifconnectfailure.inc b/ext/mysqli/tests/skipifconnectfailure.inc new file mode 100755 index 0000000000..f2b193d378 --- /dev/null +++ b/ext/mysqli/tests/skipifconnectfailure.inc @@ -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); +} +?> |