uw Thu Aug 9 08:41:13 2007 UTC
Added files:
/php-src/ext/mysqli/tests skipifconnectfailure.inc
Modified files:
/php-src/ext/mysqli/tests 001.phpt 002.phpt 003.phpt 004.phpt
005.phpt 006.phpt 007.phpt 008.phpt
009.phpt 010.phpt 011.phpt 012.phpt
013.phpt 014.phpt 015.phpt 016.phpt
017.phpt 018.phpt 019.phpt 020.phpt
021.phpt 022.phpt 023.phpt 024.phpt
025.phpt 026.phpt 027.phpt 028.phpt
029.phpt 030.phpt 031.phpt 032.phpt
033.phpt 034.phpt 035.phpt 036.phpt
037.phpt 038.phpt 039.phpt 040.phpt
041.phpt 042.phpt 043.phpt 044.phpt
045.phpt 046.phpt 047.phpt 048.phpt
049.phpt 050.phpt 051.phpt 052.phpt
053.phpt 054.phpt 055.phpt 056.phpt
057.phpt 058.phpt 059.phpt 060.phpt
061.phpt 062.phpt 063.phpt 064.phpt
065.phpt 066.phpt 067.phpt 069.phpt
070.phpt 071.phpt 072.phpt 074.phpt
Log:
Introducing new environment variable:
MYSQL_TEST_SKIP_CONNECT_FAILURE = false
Every test that needs a working MySQL connection now includes
skipifconnectfailure.inc. If MYSQL_TEST_SKIP_CONNECT_FAILURE evaluates
to true skipifconnectfailure.inc tries to establish a database
connection. If no connection can be opened, the test will be skipped.
In case of MYSQL_TEST_SKIP_CONNECT_FAILURE = false (default) an no
connection, a test who cannot establish a connection will fail.
So, if you have a buggy configuration or a server that is sometimes
not available, you can now decide if you want the tests to ignore this
and skip the test or to fail (MYSQL_TEST_CONNECT_FAILURE = false, default).
Other, minor tweaks:
042.phpt - whitespace
067.phpt - parse error in SKIPIF section fixed
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/001.phpt?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/mysqli/tests/001.phpt
diff -u php-src/ext/mysqli/tests/001.phpt:1.9
php-src/ext/mysqli/tests/001.phpt:1.10
--- php-src/ext/mysqli/tests/001.phpt:1.9 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/001.phpt Thu Aug 9 08:41:11 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/002.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/mysqli/tests/002.phpt
diff -u php-src/ext/mysqli/tests/002.phpt:1.8
php-src/ext/mysqli/tests/002.phpt:1.9
--- php-src/ext/mysqli/tests/002.phpt:1.8 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/002.phpt Thu Aug 9 08:41:11 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/003.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/mysqli/tests/003.phpt
diff -u php-src/ext/mysqli/tests/003.phpt:1.8
php-src/ext/mysqli/tests/003.phpt:1.9
--- php-src/ext/mysqli/tests/003.phpt:1.8 Thu Jul 12 20:34:50 2007
+++ php-src/ext/mysqli/tests/003.phpt Thu Aug 9 08:41:11 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/004.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/004.phpt
diff -u php-src/ext/mysqli/tests/004.phpt:1.7
php-src/ext/mysqli/tests/004.phpt:1.8
--- php-src/ext/mysqli/tests/004.phpt:1.7 Thu Jul 12 20:34:50 2007
+++ php-src/ext/mysqli/tests/004.phpt Thu Aug 9 08:41:11 2007
@@ -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");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/005.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/005.phpt
diff -u php-src/ext/mysqli/tests/005.phpt:1.6
php-src/ext/mysqli/tests/005.phpt:1.7
--- php-src/ext/mysqli/tests/005.phpt:1.6 Thu Jul 12 20:38:26 2007
+++ php-src/ext/mysqli/tests/005.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/006.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/006.phpt
diff -u php-src/ext/mysqli/tests/006.phpt:1.6
php-src/ext/mysqli/tests/006.phpt:1.7
--- php-src/ext/mysqli/tests/006.phpt:1.6 Thu Jul 12 20:38:26 2007
+++ php-src/ext/mysqli/tests/006.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/007.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/007.phpt
diff -u php-src/ext/mysqli/tests/007.phpt:1.6
php-src/ext/mysqli/tests/007.phpt:1.7
--- php-src/ext/mysqli/tests/007.phpt:1.6 Thu Jul 12 20:38:26 2007
+++ php-src/ext/mysqli/tests/007.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/008.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/008.phpt
diff -u php-src/ext/mysqli/tests/008.phpt:1.6
php-src/ext/mysqli/tests/008.phpt:1.7
--- php-src/ext/mysqli/tests/008.phpt:1.6 Thu Jul 12 20:38:26 2007
+++ php-src/ext/mysqli/tests/008.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/009.phpt?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/mysqli/tests/009.phpt
diff -u php-src/ext/mysqli/tests/009.phpt:1.10
php-src/ext/mysqli/tests/009.phpt:1.11
--- php-src/ext/mysqli/tests/009.phpt:1.10 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/009.phpt Thu Aug 9 08:41:12 2007
@@ -7,6 +7,7 @@
exit;
}
require_once('skipif.inc');
+ require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/010.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/010.phpt
diff -u php-src/ext/mysqli/tests/010.phpt:1.7
php-src/ext/mysqli/tests/010.phpt:1.8
--- php-src/ext/mysqli/tests/010.phpt:1.7 Thu Jul 12 20:42:48 2007
+++ php-src/ext/mysqli/tests/010.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/011.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/011.phpt
diff -u php-src/ext/mysqli/tests/011.phpt:1.7
php-src/ext/mysqli/tests/011.phpt:1.8
--- php-src/ext/mysqli/tests/011.phpt:1.7 Thu Jul 12 20:42:48 2007
+++ php-src/ext/mysqli/tests/011.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/012.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/012.phpt
diff -u php-src/ext/mysqli/tests/012.phpt:1.7
php-src/ext/mysqli/tests/012.phpt:1.8
--- php-src/ext/mysqli/tests/012.phpt:1.7 Thu Jul 12 20:42:48 2007
+++ php-src/ext/mysqli/tests/012.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/013.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/013.phpt
diff -u php-src/ext/mysqli/tests/013.phpt:1.7
php-src/ext/mysqli/tests/013.phpt:1.8
--- php-src/ext/mysqli/tests/013.phpt:1.7 Thu Jul 12 20:42:48 2007
+++ php-src/ext/mysqli/tests/013.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/014.phpt?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/mysqli/tests/014.phpt
diff -u php-src/ext/mysqli/tests/014.phpt:1.12
php-src/ext/mysqli/tests/014.phpt:1.13
--- php-src/ext/mysqli/tests/014.phpt:1.12 Thu Jul 12 20:42:48 2007
+++ php-src/ext/mysqli/tests/014.phpt Thu Aug 9 08:41:12 2007
@@ -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'")) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/015.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/015.phpt
diff -u php-src/ext/mysqli/tests/015.phpt:1.7
php-src/ext/mysqli/tests/015.phpt:1.8
--- php-src/ext/mysqli/tests/015.phpt:1.7 Thu Jul 12 20:42:48 2007
+++ php-src/ext/mysqli/tests/015.phpt Thu Aug 9 08:41:12 2007
@@ -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'");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/016.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/016.phpt
diff -u php-src/ext/mysqli/tests/016.phpt:1.6
php-src/ext/mysqli/tests/016.phpt:1.7
--- php-src/ext/mysqli/tests/016.phpt:1.6 Thu Jul 12 20:42:48 2007
+++ php-src/ext/mysqli/tests/016.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/017.phpt?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/mysqli/tests/017.phpt
diff -u php-src/ext/mysqli/tests/017.phpt:1.10
php-src/ext/mysqli/tests/017.phpt:1.11
--- php-src/ext/mysqli/tests/017.phpt:1.10 Thu Jul 12 20:42:48 2007
+++ php-src/ext/mysqli/tests/017.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/018.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/018.phpt
diff -u php-src/ext/mysqli/tests/018.phpt:1.5
php-src/ext/mysqli/tests/018.phpt:1.6
--- php-src/ext/mysqli/tests/018.phpt:1.5 Thu Jul 12 20:42:48 2007
+++ php-src/ext/mysqli/tests/018.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/019.phpt?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/mysqli/tests/019.phpt
diff -u php-src/ext/mysqli/tests/019.phpt:1.9
php-src/ext/mysqli/tests/019.phpt:1.10
--- php-src/ext/mysqli/tests/019.phpt:1.9 Thu Jul 12 20:42:48 2007
+++ php-src/ext/mysqli/tests/019.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/020.phpt?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/mysqli/tests/020.phpt
diff -u php-src/ext/mysqli/tests/020.phpt:1.10
php-src/ext/mysqli/tests/020.phpt:1.11
--- php-src/ext/mysqli/tests/020.phpt:1.10 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/020.phpt Thu Aug 9 08:41:12 2007
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/021.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/021.phpt
diff -u php-src/ext/mysqli/tests/021.phpt:1.7
php-src/ext/mysqli/tests/021.phpt:1.8
--- php-src/ext/mysqli/tests/021.phpt:1.7 Thu Jul 12 20:49:29 2007
+++ php-src/ext/mysqli/tests/021.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/022.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/022.phpt
diff -u php-src/ext/mysqli/tests/022.phpt:1.7
php-src/ext/mysqli/tests/022.phpt:1.8
--- php-src/ext/mysqli/tests/022.phpt:1.7 Thu Jul 12 20:49:29 2007
+++ php-src/ext/mysqli/tests/022.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/023.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/mysqli/tests/023.phpt
diff -u php-src/ext/mysqli/tests/023.phpt:1.8
php-src/ext/mysqli/tests/023.phpt:1.9
--- php-src/ext/mysqli/tests/023.phpt:1.8 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/023.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/024.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/mysqli/tests/024.phpt
diff -u php-src/ext/mysqli/tests/024.phpt:1.8
php-src/ext/mysqli/tests/024.phpt:1.9
--- php-src/ext/mysqli/tests/024.phpt:1.8 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/024.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/025.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/mysqli/tests/025.phpt
diff -u php-src/ext/mysqli/tests/025.phpt:1.8
php-src/ext/mysqli/tests/025.phpt:1.9
--- php-src/ext/mysqli/tests/025.phpt:1.8 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/025.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/026.phpt?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/mysqli/tests/026.phpt
diff -u php-src/ext/mysqli/tests/026.phpt:1.9
php-src/ext/mysqli/tests/026.phpt:1.10
--- php-src/ext/mysqli/tests/026.phpt:1.9 Thu Jul 12 20:49:29 2007
+++ php-src/ext/mysqli/tests/026.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/027.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/027.phpt
diff -u php-src/ext/mysqli/tests/027.phpt:1.5
php-src/ext/mysqli/tests/027.phpt:1.6
--- php-src/ext/mysqli/tests/027.phpt:1.5 Thu Jul 12 20:49:29 2007
+++ php-src/ext/mysqli/tests/027.phpt Thu Aug 9 08:41:12 2007
@@ -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);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/028.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/028.phpt
diff -u php-src/ext/mysqli/tests/028.phpt:1.7
php-src/ext/mysqli/tests/028.phpt:1.8
--- php-src/ext/mysqli/tests/028.phpt:1.7 Thu Jul 12 20:49:29 2007
+++ php-src/ext/mysqli/tests/028.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/029.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/029.phpt
diff -u php-src/ext/mysqli/tests/029.phpt:1.4
php-src/ext/mysqli/tests/029.phpt:1.5
--- php-src/ext/mysqli/tests/029.phpt:1.4 Thu Jul 12 20:49:29 2007
+++ php-src/ext/mysqli/tests/029.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/030.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/030.phpt
diff -u php-src/ext/mysqli/tests/030.phpt:1.4
php-src/ext/mysqli/tests/030.phpt:1.5
--- php-src/ext/mysqli/tests/030.phpt:1.4 Thu Jul 12 20:53:05 2007
+++ php-src/ext/mysqli/tests/030.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/031.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/031.phpt
diff -u php-src/ext/mysqli/tests/031.phpt:1.5
php-src/ext/mysqli/tests/031.phpt:1.6
--- php-src/ext/mysqli/tests/031.phpt:1.5 Thu Jul 12 20:53:05 2007
+++ php-src/ext/mysqli/tests/031.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/032.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/032.phpt
diff -u php-src/ext/mysqli/tests/032.phpt:1.5
php-src/ext/mysqli/tests/032.phpt:1.6
--- php-src/ext/mysqli/tests/032.phpt:1.5 Thu Jul 12 20:53:05 2007
+++ php-src/ext/mysqli/tests/032.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/033.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/033.phpt
diff -u php-src/ext/mysqli/tests/033.phpt:1.6
php-src/ext/mysqli/tests/033.phpt:1.7
--- php-src/ext/mysqli/tests/033.phpt:1.6 Thu Jul 12 20:53:05 2007
+++ php-src/ext/mysqli/tests/033.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/034.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/034.phpt
diff -u php-src/ext/mysqli/tests/034.phpt:1.5
php-src/ext/mysqli/tests/034.phpt:1.6
--- php-src/ext/mysqli/tests/034.phpt:1.5 Thu Jul 12 20:53:05 2007
+++ php-src/ext/mysqli/tests/034.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/035.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/035.phpt
diff -u php-src/ext/mysqli/tests/035.phpt:1.5
php-src/ext/mysqli/tests/035.phpt:1.6
--- php-src/ext/mysqli/tests/035.phpt:1.5 Thu Jul 12 20:53:05 2007
+++ php-src/ext/mysqli/tests/035.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/036.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/036.phpt
diff -u php-src/ext/mysqli/tests/036.phpt:1.5
php-src/ext/mysqli/tests/036.phpt:1.6
--- php-src/ext/mysqli/tests/036.phpt:1.5 Thu Jul 12 20:53:05 2007
+++ php-src/ext/mysqli/tests/036.phpt Thu Aug 9 08:41:12 2007
@@ -7,6 +7,7 @@
exit;
}
require_once('skipif.inc');
+ require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/037.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/037.phpt
diff -u php-src/ext/mysqli/tests/037.phpt:1.4
php-src/ext/mysqli/tests/037.phpt:1.5
--- php-src/ext/mysqli/tests/037.phpt:1.4 Thu Jul 12 20:53:05 2007
+++ php-src/ext/mysqli/tests/037.phpt Thu Aug 9 08:41:12 2007
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/038.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/038.phpt
diff -u php-src/ext/mysqli/tests/038.phpt:1.4
php-src/ext/mysqli/tests/038.phpt:1.5
--- php-src/ext/mysqli/tests/038.phpt:1.4 Thu Jul 12 20:53:05 2007
+++ php-src/ext/mysqli/tests/038.phpt Thu Aug 9 08:41:12 2007
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/039.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/039.phpt
diff -u php-src/ext/mysqli/tests/039.phpt:1.4
php-src/ext/mysqli/tests/039.phpt:1.5
--- php-src/ext/mysqli/tests/039.phpt:1.4 Thu Jul 12 20:53:05 2007
+++ php-src/ext/mysqli/tests/039.phpt Thu Aug 9 08:41:12 2007
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/040.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/040.phpt
diff -u php-src/ext/mysqli/tests/040.phpt:1.4
php-src/ext/mysqli/tests/040.phpt:1.5
--- php-src/ext/mysqli/tests/040.phpt:1.4 Thu Jul 12 20:55:12 2007
+++ php-src/ext/mysqli/tests/040.phpt Thu Aug 9 08:41:12 2007
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/041.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/041.phpt
diff -u php-src/ext/mysqli/tests/041.phpt:1.6
php-src/ext/mysqli/tests/041.phpt:1.7
--- php-src/ext/mysqli/tests/041.phpt:1.6 Thu Jul 12 20:55:12 2007
+++ php-src/ext/mysqli/tests/041.phpt Thu Aug 9 08:41:12 2007
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/042.phpt?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/mysqli/tests/042.phpt
diff -u php-src/ext/mysqli/tests/042.phpt:1.10
php-src/ext/mysqli/tests/042.phpt:1.11
--- php-src/ext/mysqli/tests/042.phpt:1.10 Thu Jul 12 20:55:12 2007
+++ php-src/ext/mysqli/tests/042.phpt Thu Aug 9 08:41:12 2007
@@ -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_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);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/043.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/043.phpt
diff -u php-src/ext/mysqli/tests/043.phpt:1.7
php-src/ext/mysqli/tests/043.phpt:1.8
--- php-src/ext/mysqli/tests/043.phpt:1.7 Thu Jul 12 20:55:12 2007
+++ php-src/ext/mysqli/tests/043.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/044.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/044.phpt
diff -u php-src/ext/mysqli/tests/044.phpt:1.4
php-src/ext/mysqli/tests/044.phpt:1.5
--- php-src/ext/mysqli/tests/044.phpt:1.4 Thu Jul 12 20:55:12 2007
+++ php-src/ext/mysqli/tests/044.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/045.phpt?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/mysqli/tests/045.phpt
diff -u php-src/ext/mysqli/tests/045.phpt:1.10
php-src/ext/mysqli/tests/045.phpt:1.11
--- php-src/ext/mysqli/tests/045.phpt:1.10 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/045.phpt Thu Aug 9 08:41:12 2007
@@ -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);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/046.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/046.phpt
diff -u php-src/ext/mysqli/tests/046.phpt:1.6
php-src/ext/mysqli/tests/046.phpt:1.7
--- php-src/ext/mysqli/tests/046.phpt:1.6 Thu Jul 12 20:55:12 2007
+++ php-src/ext/mysqli/tests/046.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/047.phpt?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/mysqli/tests/047.phpt
diff -u php-src/ext/mysqli/tests/047.phpt:1.11
php-src/ext/mysqli/tests/047.phpt:1.12
--- php-src/ext/mysqli/tests/047.phpt:1.11 Thu Jul 12 20:55:12 2007
+++ php-src/ext/mysqli/tests/047.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/048.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/048.phpt
diff -u php-src/ext/mysqli/tests/048.phpt:1.7
php-src/ext/mysqli/tests/048.phpt:1.8
--- php-src/ext/mysqli/tests/048.phpt:1.7 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/048.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/049.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/049.phpt
diff -u php-src/ext/mysqli/tests/049.phpt:1.7
php-src/ext/mysqli/tests/049.phpt:1.8
--- php-src/ext/mysqli/tests/049.phpt:1.7 Thu Jul 12 20:55:12 2007
+++ php-src/ext/mysqli/tests/049.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/050.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/050.phpt
diff -u php-src/ext/mysqli/tests/050.phpt:1.4
php-src/ext/mysqli/tests/050.phpt:1.5
--- php-src/ext/mysqli/tests/050.phpt:1.4 Thu Jul 12 20:57:30 2007
+++ php-src/ext/mysqli/tests/050.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/051.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/051.phpt
diff -u php-src/ext/mysqli/tests/051.phpt:1.5
php-src/ext/mysqli/tests/051.phpt:1.6
--- php-src/ext/mysqli/tests/051.phpt:1.5 Thu Jul 12 20:57:30 2007
+++ php-src/ext/mysqli/tests/051.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/052.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/052.phpt
diff -u php-src/ext/mysqli/tests/052.phpt:1.5
php-src/ext/mysqli/tests/052.phpt:1.6
--- php-src/ext/mysqli/tests/052.phpt:1.5 Thu Jul 12 20:57:30 2007
+++ php-src/ext/mysqli/tests/052.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/053.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/053.phpt
diff -u php-src/ext/mysqli/tests/053.phpt:1.4
php-src/ext/mysqli/tests/053.phpt:1.5
--- php-src/ext/mysqli/tests/053.phpt:1.4 Thu Jul 12 20:57:30 2007
+++ php-src/ext/mysqli/tests/053.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/054.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/054.phpt
diff -u php-src/ext/mysqli/tests/054.phpt:1.4
php-src/ext/mysqli/tests/054.phpt:1.5
--- php-src/ext/mysqli/tests/054.phpt:1.4 Thu Jul 12 20:57:30 2007
+++ php-src/ext/mysqli/tests/054.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/055.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/055.phpt
diff -u php-src/ext/mysqli/tests/055.phpt:1.4
php-src/ext/mysqli/tests/055.phpt:1.5
--- php-src/ext/mysqli/tests/055.phpt:1.4 Thu Jul 12 20:57:30 2007
+++ php-src/ext/mysqli/tests/055.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/056.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/056.phpt
diff -u php-src/ext/mysqli/tests/056.phpt:1.4
php-src/ext/mysqli/tests/056.phpt:1.5
--- php-src/ext/mysqli/tests/056.phpt:1.4 Thu Jul 12 20:57:30 2007
+++ php-src/ext/mysqli/tests/056.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/057.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/057.phpt
diff -u php-src/ext/mysqli/tests/057.phpt:1.6
php-src/ext/mysqli/tests/057.phpt:1.7
--- php-src/ext/mysqli/tests/057.phpt:1.6 Thu Jul 12 20:57:30 2007
+++ php-src/ext/mysqli/tests/057.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/058.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/058.phpt
diff -u php-src/ext/mysqli/tests/058.phpt:1.6
php-src/ext/mysqli/tests/058.phpt:1.7
--- php-src/ext/mysqli/tests/058.phpt:1.6 Thu Jul 12 20:57:30 2007
+++ php-src/ext/mysqli/tests/058.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/059.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqli/tests/059.phpt
diff -u php-src/ext/mysqli/tests/059.phpt:1.6
php-src/ext/mysqli/tests/059.phpt:1.7
--- php-src/ext/mysqli/tests/059.phpt:1.6 Thu Jul 12 20:57:30 2007
+++ php-src/ext/mysqli/tests/059.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/060.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/060.phpt
diff -u php-src/ext/mysqli/tests/060.phpt:1.7
php-src/ext/mysqli/tests/060.phpt:1.8
--- php-src/ext/mysqli/tests/060.phpt:1.7 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/060.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/061.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/061.phpt
diff -u php-src/ext/mysqli/tests/061.phpt:1.7
php-src/ext/mysqli/tests/061.phpt:1.8
--- php-src/ext/mysqli/tests/061.phpt:1.7 Thu Jul 12 21:02:21 2007
+++ php-src/ext/mysqli/tests/061.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/062.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/062.phpt
diff -u php-src/ext/mysqli/tests/062.phpt:1.3
php-src/ext/mysqli/tests/062.phpt:1.4
--- php-src/ext/mysqli/tests/062.phpt:1.3 Thu Jul 12 21:02:21 2007
+++ php-src/ext/mysqli/tests/062.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/063.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/063.phpt
diff -u php-src/ext/mysqli/tests/063.phpt:1.3
php-src/ext/mysqli/tests/063.phpt:1.4
--- php-src/ext/mysqli/tests/063.phpt:1.3 Thu Jul 12 21:02:21 2007
+++ php-src/ext/mysqli/tests/063.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/064.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/064.phpt
diff -u php-src/ext/mysqli/tests/064.phpt:1.2
php-src/ext/mysqli/tests/064.phpt:1.3
--- php-src/ext/mysqli/tests/064.phpt:1.2 Thu Jul 12 21:02:21 2007
+++ php-src/ext/mysqli/tests/064.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/065.phpt?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqli/tests/065.phpt
diff -u php-src/ext/mysqli/tests/065.phpt:1.7
php-src/ext/mysqli/tests/065.phpt:1.8
--- php-src/ext/mysqli/tests/065.phpt:1.7 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/065.phpt Thu Aug 9 08:41:12 2007
@@ -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');
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/066.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/066.phpt
diff -u php-src/ext/mysqli/tests/066.phpt:1.2
php-src/ext/mysqli/tests/066.phpt:1.3
--- php-src/ext/mysqli/tests/066.phpt:1.2 Thu Jul 12 21:02:21 2007
+++ php-src/ext/mysqli/tests/066.phpt Thu Aug 9 08:41:12 2007
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/067.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/067.phpt
diff -u php-src/ext/mysqli/tests/067.phpt:1.3
php-src/ext/mysqli/tests/067.phpt:1.4
--- php-src/ext/mysqli/tests/067.phpt:1.3 Mon Jul 23 12:04:19 2007
+++ php-src/ext/mysqli/tests/067.phpt Thu Aug 9 08:41:12 2007
@@ -3,22 +3,22 @@
--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",
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/069.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/069.phpt
diff -u php-src/ext/mysqli/tests/069.phpt:1.3
php-src/ext/mysqli/tests/069.phpt:1.4
--- php-src/ext/mysqli/tests/069.phpt:1.3 Thu Jul 12 21:02:21 2007
+++ php-src/ext/mysqli/tests/069.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/070.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/070.phpt
diff -u php-src/ext/mysqli/tests/070.phpt:1.2
php-src/ext/mysqli/tests/070.phpt:1.3
--- php-src/ext/mysqli/tests/070.phpt:1.2 Thu Jul 12 21:02:21 2007
+++ php-src/ext/mysqli/tests/070.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/071.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/071.phpt
diff -u php-src/ext/mysqli/tests/071.phpt:1.5
php-src/ext/mysqli/tests/071.phpt:1.6
--- php-src/ext/mysqli/tests/071.phpt:1.5 Thu Jul 12 21:02:21 2007
+++ php-src/ext/mysqli/tests/071.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/072.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/072.phpt
diff -u php-src/ext/mysqli/tests/072.phpt:1.3
php-src/ext/mysqli/tests/072.phpt:1.4
--- php-src/ext/mysqli/tests/072.phpt:1.3 Thu Jul 12 21:02:21 2007
+++ php-src/ext/mysqli/tests/072.phpt Thu Aug 9 08:41:12 2007
@@ -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";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/074.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/074.phpt
diff -u php-src/ext/mysqli/tests/074.phpt:1.3
php-src/ext/mysqli/tests/074.phpt:1.4
--- php-src/ext/mysqli/tests/074.phpt:1.3 Thu Jul 12 21:02:21 2007
+++ php-src/ext/mysqli/tests/074.phpt Thu Aug 9 08:41:12 2007
@@ -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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/skipifconnectfailure.inc?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/skipifconnectfailure.inc
+++ php-src/ext/mysqli/tests/skipifconnectfailure.inc
<?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);
}
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
