Proxying as many connect calls as possible to make testing of the compression protocol @ mysqlnd easier. By setting the environment variable MYSQL_TEST_COMPRESS you can tell the tests to set the MYSQLI_CLIENT_COMPRESS flag upon connect.

ext/mysqli/tests/001.phpt

@@ -1,8 +1,8 @@
 --TEST--
 mysqli connect
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
@@ -13,25 +13,25 @@ require_once('skipifconnectfailure.inc');
 	$test = "";
 
 	/*** test mysqli_connect localhost:port ***/
-	$link = mysqli_connect($host, $user, $passwd, "", $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, "", $port, $socket);
 	$test .= ($link) ? "1" : "0";
 	mysqli_close($link);
 
 	/*** test mysqli_real_connect ***/
 	$link = mysqli_init();
-	$test.= (mysqli_real_connect($link, $host, $user, $passwd, "", $port, $socket) )
+	$test.= (my_mysqli_real_connect($link, $host, $user, $passwd, "", $port, $socket) )
 		? "1" : "0";
 	mysqli_close($link);
 
 	/*** test mysqli_real_connect with db ***/
 	$link = mysqli_init();
-	$test .= (mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))
+	$test .= (my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))
 		? "1" : "0";
 	mysqli_close($link);
 
 	/*** test mysqli_real_connect with port ***/
 	$link = mysqli_init();
-	$test .= (mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))
+	$test .= (my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))
 		? "1":"0";
 	mysqli_close($link);
 
@@ -40,7 +40,7 @@ require_once('skipifconnectfailure.inc');
 		if (!$link = mysqli_init())
 			printf("[001 + %d] mysqli_init() failed, [%d] %s\n", $i, mysqli_connect_errno(), mysqli_connect_error());
 
-		if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))
+		if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))
 			printf("[002 + %d] mysqli_real_connect() failed, [%d] %s\n", $i, mysqli_connect_errno(), mysqli_connect_error());
 
 		mysqli_close($link);
@@ -49,7 +49,7 @@ require_once('skipifconnectfailure.inc');
 	/*** test mysqli_real_connect compressed ***/
 	/*
 	$link = mysqli_init();
-	$test .= (mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, MYSQLI_CLIENT_COMPRESS))
+	$test .= (my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, MYSQLI_CLIENT_COMPRESS))
 		? "1" : "0";
 	mysqli_close($link);
   */

ext/mysqli/tests/002.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
 	   printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 	if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null"))
@@ -49,7 +49,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null"))

ext/mysqli/tests/003.phpt

@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 <?php
 	include "connect.inc";
 
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_query($link, "SET sql_mode=''");
 
@@ -75,7 +75,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))

ext/mysqli/tests/004.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include ("connect.inc");
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/005.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -43,7 +43,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/006.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_query($link, "SET sql_mode=''"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -48,7 +48,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/007.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_query($link, "SET sql_mode=''"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -48,7 +48,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/008.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_query($link, "SET sql_mode=''"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -48,7 +48,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/009.phpt

@@ -14,7 +14,7 @@ mysqli fetch bigint values (ok to fail with 4.1.x)
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_query($link, "SET sql_mode=''"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -81,7 +81,7 @@ mysqli fetch bigint values (ok to fail with 4.1.x)
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/010.phpt

@@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_query($link, "SET sql_mode=''"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -51,7 +51,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/011.phpt

@@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -48,7 +48,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))

ext/mysqli/tests/012.phpt

@@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))

ext/mysqli/tests/013.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -59,7 +59,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))

ext/mysqli/tests/014.phpt

@@ -5,7 +5,7 @@ mysqli autocommit/commit/rollback
 	require_once('skipif.inc');
 	require_once('skipifconnectfailure.inc');
 	include "connect.inc";
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 	if (!$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'")) {
 		die("skip Cannot check for required InnoDB suppot");
 	}
@@ -22,7 +22,7 @@ mysqli autocommit/commit/rollback
 --FILE--
 <?php
 	include "connect.inc";
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_autocommit($link, TRUE))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

ext/mysqli/tests/015.phpt

@@ -5,7 +5,7 @@ mysqli autocommit/commit/rollback with innodb
 	require_once('skipif.inc');
 	require_once('skipifconnectfailure.inc');
 	include "connect.inc";
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 	$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'");
 	$row = mysqli_fetch_row($result);
 	mysqli_free_result($result);
@@ -19,7 +19,7 @@ mysqli autocommit/commit/rollback with innodb
 <?php
 	include "connect.inc";
 
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 	if (!$link)
 		printf("[001] Cannot connect, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

ext/mysqli/tests/016.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_query($link, "SET @dummy='foobar'"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

ext/mysqli/tests/017.phpt

@@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!$stmt = mysqli_prepare($link, "SELECT md5('bar'), database(), 'foo'"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

ext/mysqli/tests/018.phpt

@@ -1,8 +1,8 @@
 --TEST--
 mysqli fetch system variables
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_query($link, "SET AUTOCOMMIT=0"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

ext/mysqli/tests/019.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	if (!mysqli_query($link, "DROP TABLE IF EXISTS insert_read"))
 		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -58,7 +58,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS insert_read"))

ext/mysqli/tests/020.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 	mysqli_query($link, "SET sql_mode=''");
@@ -70,7 +70,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))

ext/mysqli/tests/021.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -41,7 +41,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/022.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -46,7 +46,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/023.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 	mysqli_query($link, "SET sql_mode=''");
@@ -55,7 +55,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/024.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 	mysqli_query($link, "SET sql_mode=''");
@@ -55,7 +55,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/025.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 	mysqli_query($link, "SET sql_mode=''");
@@ -60,7 +60,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/026.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 	mysqli_query($link, "SET sql_mode=''");
@@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/027.phpt

@@ -1,8 +1,8 @@
 --TEST--
 function test: mysqli_stat
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$status = mysqli_stat($link);
 

ext/mysqli/tests/028.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$cset = substr(mysqli_character_set_name($link),0,6);
 

ext/mysqli/tests/029.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -29,7 +29,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS general_test"))

ext/mysqli/tests/030.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 	$errno = mysqli_errno($link);
 	var_dump($errno);
 

ext/mysqli/tests/031.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 	$error = mysqli_error($link);
 	var_dump($error);
 

ext/mysqli/tests/032.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -29,7 +29,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS general_test"))

ext/mysqli/tests/033.phpt

@@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$hinfo = mysqli_get_host_info($link);
 

ext/mysqli/tests/034.phpt

@@ -1,8 +1,8 @@
 --TEST--
 function test: mysqli_get_proto_info
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
@@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$pinfo = mysqli_get_proto_info($link);
 

ext/mysqli/tests/035.phpt

@@ -1,8 +1,8 @@
 --TEST--
 function test: mysqli_get_server_info
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$sinfo = substr(mysqli_get_server_info($link),0,1);
 

ext/mysqli/tests/036.phpt

@@ -14,7 +14,7 @@ function test: mysqli_insert_id()
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -45,7 +45,7 @@ function test: mysqli_insert_id()
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS t036"))

ext/mysqli/tests/037.phpt

@@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -35,7 +35,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_result"))

ext/mysqli/tests/038.phpt

@@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -36,7 +36,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_result"))

ext/mysqli/tests/039.phpt

@@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_real_query($link, "SHOW VARIABLES");
 

ext/mysqli/tests/040.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -34,7 +34,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_result"))

ext/mysqli/tests/041.phpt

@@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 	mysqli_select_db($link, $db);
 
 	mysqli_query($link, "DROP TABLE IF EXISTS test_warnings");
@@ -25,7 +25,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_warnings"))

ext/mysqli/tests/042.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 	mysqli_query($link, "SET sql_mode=''");
@@ -51,7 +51,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))

ext/mysqli/tests/043.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -43,7 +43,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_update"))

ext/mysqli/tests/044.phpt

@@ -1,8 +1,8 @@
 --TEST--
 mysqli_get_server_version
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$i = mysqli_get_server_version($link);
 

ext/mysqli/tests/045.phpt

@@ -7,7 +7,7 @@ mysqli_bind_result (SHOW)
 	require_once('skipifconnectfailure.inc');
 
 	include "connect.inc";
-	$link = mysqli_connect($host, $user, $passwd);
+	$link = my_mysqli_connect($host, $user, $passwd);
 
 	$stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
 	mysqli_execute($stmt);
@@ -23,7 +23,7 @@ mysqli_bind_result (SHOW)
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
 	mysqli_execute($stmt);

ext/mysqli/tests/046.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -37,7 +37,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_affected"))

ext/mysqli/tests/047.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -48,7 +48,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_affected"))

ext/mysqli/tests/048.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$mysql = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$mysql = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$mysql->select_db($db);
 	$mysql->query("DROP TABLE IF EXISTS test_fetch_null");
@@ -43,7 +43,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null"))

ext/mysqli/tests/049.phpt

@@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$mysql = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$mysql = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$mysql->select_db($db);
 	$result = $mysql->query("SELECT DATABASE()");
@@ -19,6 +19,8 @@ require_once('skipifconnectfailure.inc');
 	$result->close();
 
 	var_dump($row);
+	if ($row[0] != $db)
+		printf("[001] Expecting '%s' got '%s'\n", $db, $row[0]);
 
 	$mysql->close();
 	print "done!";

ext/mysqli/tests/050.phpt

@@ -1,8 +1,8 @@
 --TEST--
 non freed statement test
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc');
 	/************************
 	 * non freed stamement
 	 ************************/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$stmt = mysqli_prepare($link, "SELECT CURRENT_USER()");
 	mysqli_execute($stmt);

ext/mysqli/tests/051.phpt

@@ -1,8 +1,8 @@
 --TEST--
 free statement after close
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc');
 	/************************
 	 * free statement after close
 	 ************************/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$stmt1 = mysqli_prepare($link, "SELECT CURRENT_USER()");
 	mysqli_execute($stmt1);

ext/mysqli/tests/052.phpt

@@ -1,18 +1,18 @@
 --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";
-	
+
 	/************************
-	 * statement call  after close 
+	 * statement call  after close
 	 ************************/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$stmt2 = mysqli_prepare($link, "SELECT CURRENT_USER()");
 

ext/mysqli/tests/053.phpt

@@ -1,18 +1,18 @@
 --TEST--
-not freed resultset 
+not freed resultset
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
 	include "connect.inc";
-	
+
 	/************************
-	 * non freed resultset 
+	 * non freed resultset
 	 ************************/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$result = mysqli_query($link, "SELECT CURRENT_USER()");
 	mysqli_close($link);

ext/mysqli/tests/054.phpt

@@ -1,18 +1,18 @@
 --TEST--
-free resultset after close 
+free resultset after close
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
 	include "connect.inc";
-	
+
 	/************************
-	 * free resultset after close 
+	 * free resultset after close
 	 ************************/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$result1 = mysqli_query($link, "SELECT CURRENT_USER()");
 	mysqli_close($link);

ext/mysqli/tests/055.phpt

@@ -1,18 +1,18 @@
 --TEST--
-free nothing 
+free nothing
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
 	include "connect.inc";
-	
+
 	/************************
-	 * don't free anything 
+	 * don't free anything
 	 ************************/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$result2 = mysqli_query($link, "SELECT CURRENT_USER()");
 	$stmt2 = mysqli_prepare($link, "SELECT CURRENT_USER()");

ext/mysqli/tests/057.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -65,7 +65,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_store_result"))

ext/mysqli/tests/058.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -51,7 +51,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind"))

ext/mysqli/tests/059.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
@@ -44,7 +44,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind"))

ext/mysqli/tests/060.phpt

@@ -16,7 +16,7 @@ require_once('skipifconnectfailure.inc');
 	}
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 	mysqli_query($link, "SET sql_mode=''");
@@ -45,7 +45,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch"))

ext/mysqli/tests/061.phpt

@@ -17,7 +17,7 @@ if (!function_exists('mysqli_set_local_infile_handler'))
 	}
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	/* create temporary file */
 	$filename = dirname(__FILE__) . "061.csv";
@@ -52,7 +52,7 @@ if (!function_exists('mysqli_set_local_infile_handler'))
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS t_061"))

ext/mysqli/tests/062.phpt

@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 <?php
 	include "connect.inc";
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
 	$mysql->real_query("SELECT 'foo' FROM DUAL");
 

ext/mysqli/tests/063.phpt

@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 <?php
 	include "connect.inc";
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
 	$stmt = new mysqli_stmt($mysql, "SELECT 'foo' FROM DUAL");
 	$stmt->execute();

ext/mysqli/tests/064.phpt

@@ -1,15 +1,15 @@
 --TEST--
-NULL binding 
+NULL binding
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
 	include "connect.inc";
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
 	$stmt = new mysqli_stmt($mysql, "SELECT NULL FROM DUAL");
 	$stmt->execute();

ext/mysqli/tests/065.phpt

@@ -16,7 +16,7 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
 <?php
 	include "connect.inc";
 
-	if (!$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket))
+	if (!$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket))
 		printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 	if (!mysqli_query($mysql, "SET sql_mode=''"))

ext/mysqli/tests/066.phpt

@@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
 	$mysql->query("DROP TABLE IF EXISTS test_warnings");
 
@@ -31,7 +31,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_warnings"))

ext/mysqli/tests/067.phpt

@@ -6,7 +6,7 @@ function test: nested selects (cursors)
 	require_once('skipifconnectfailure.inc');
 	include "connect.inc";
 
-	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
 		die("skip Cannot connect to check required version");
 
 	/* skip cursor test for versions < 50004 */
@@ -30,7 +30,7 @@ function test: nested selects (cursors)
 	}
 
 	include "connect.inc";
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
 	if ((!$IS_MYSQLND && mysqli_get_client_version() < 50009) ||
 		(mysqli_get_server_version($mysql) < 50009)) {
@@ -67,7 +67,7 @@ function test: nested selects (cursors)
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 for ($i =0; $i < 3; $i++) {

ext/mysqli/tests/069.phpt

@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 <?php
 	include "connect.inc";
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 	$mysql->multi_query('SELECT 1;SELECT 2');
 	do {
 		$res = $mysql->store_result();

ext/mysqli/tests/070.phpt

@@ -1,15 +1,15 @@
 --TEST--
 mysqli ping
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
 	include "connect.inc";
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 	var_dump($mysql->ping());
 	$mysql->close();
 	print "done!";

ext/mysqli/tests/071.phpt

@@ -1,8 +1,8 @@
 --TEST--
 mysqli thread_id & kill
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 <?php
 	include "connect.inc";
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
 	var_dump($mysql->ping());
 
@@ -20,7 +20,7 @@ require_once('skipifconnectfailure.inc');
 
 	$mysql->close();
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
 	var_dump(mysqli_ping($mysql));
 

ext/mysqli/tests/072.phpt

@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 <?php
 	include "connect.inc";
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
 	$mysql->query("DROP TABLE IF EXISTS not_exists");
 

ext/mysqli/tests/074.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 
 	include "connect.inc";
 
-	$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
 	var_dump($mysqli->autocommit(false));
 	$result = $mysqli->query("SELECT @@autocommit");

ext/mysqli/tests/bug31668.phpt

@@ -11,7 +11,7 @@ error_reporting = E_ALL & ~E_STRICT
 <?php
 	include "connect.inc";
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 	$mysql->multi_query('SELECT 1;SELECT 2');
 	do {
 		$res = $mysql->store_result();
@@ -25,7 +25,7 @@ error_reporting = E_ALL & ~E_STRICT
 	var_dump($mysql->error, __LINE__);
 	$mysql->close();
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 	$mysql->multi_query('SELECT 1;SELECT 2');
 	do {
 		$res = $mysql->store_result();

ext/mysqli/tests/bug32405.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include ("connect.inc");
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 	mysqli_select_db($link, "test");
 	mysqli_query($link, "SET sql_mode=''");
 
@@ -34,7 +34,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_users"))

ext/mysqli/tests/bug33090.phpt

@@ -1,8 +1,8 @@
 --TEST--
 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--
@@ -10,13 +10,13 @@ require_once('skipifconnectfailure.inc');
 	include ("connect.inc");
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, null, $port, $socket);
+	$link = my_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();
 ?>
 --EXPECT--

ext/mysqli/tests/bug34785.phpt

@@ -1,8 +1,8 @@
 --TEST--
 Bug #34785 (Can not properly subclass mysqli_stmt)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -24,7 +24,7 @@ require_once('skipifconnectfailure.inc');
 	}
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 	mysqli_query($link, "SET sql_mode=''");
 
 	$stmt = new my_stmt($link, "SELECT 'foo' FROM DUAL");

ext/mysqli/tests/bug34810.phpt

@@ -12,14 +12,14 @@ class DbConnection {
 	public function connect() {
 		include "connect.inc";
 
-		$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+		$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 		var_dump($link);
 
 		$link = mysqli_init();
 		/* @ is to supress 'Property access is not allowed yet' */
 		@var_dump($link);
 
-		$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+		$mysql = new my_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=''");
@@ -36,7 +36,7 @@ echo "Done\n";
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_warnings"))

ext/mysqli/tests/bug35103.phpt

@@ -14,7 +14,7 @@ DROP TABLE test_buint;
 EOSQL;
 	include "connect.inc";
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 	$mysql->query("DROP TABLE IF EXISTS test_bint");
 	$mysql->query("CREATE TABLE test_bint (a bigint(20) default NULL) ENGINE=MYISAM");
 	$mysql->query("INSERT INTO test_bint VALUES (9223372036854775807),(-9223372036854775808),(-2147483648),(-2147483649),(-2147483647),(2147483647),(2147483648),(2147483649)");
@@ -54,7 +54,7 @@ EOSQL;
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bint") || !mysqli_query($link, "DROP TABLE IF EXISTS test_buint"))

ext/mysqli/tests/bug35517.phpt

@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 <?php
 	include "connect.inc";
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
 	$mysql->query("CREATE TABLE temp (id INT UNSIGNED NOT NULL)");
 	$mysql->query("INSERT INTO temp (id) VALUES (3000000897),(3800001532),(3900002281),(3100059612)");
@@ -40,7 +40,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS temp"))

ext/mysqli/tests/bug35759.phpt

@@ -48,7 +48,7 @@ EOSQL;
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS blobby"))

ext/mysqli/tests/bug36420.phpt

@@ -1,15 +1,15 @@
 --TEST--
 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
 
 include "connect.inc";
-$mysqli = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+$mysqli = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 $result = $mysqli->query('select 1');
 
@@ -21,7 +21,7 @@ echo $result->num_rows;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: main(): Couldn't fetch mysqli_result in %s on line %d
 
 Warning: main(): Couldn't fetch mysqli_result in %s on line %d

ext/mysqli/tests/bug36745.phpt

@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 	include ("connect.inc");
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$mysql = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+	$mysql = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$mysql->query("DROP TABLE IF EXISTS litest");
 	$mysql->query("CREATE TABLE litest (a VARCHAR(20))");
@@ -24,7 +24,7 @@ require_once('skipifconnectfailure.inc');
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS litest"))

ext/mysqli/tests/bug36802.phpt

@@ -4,16 +4,13 @@ Bug #36802 (crashes with with mysqli_set_charset())
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-
-	class my_mysqli extends mysqli {
-		function __construct() 
+	class really_my_mysqli extends mysqli {
+		function __construct()
 		{
 		}
 	}
 
 	include "connect.inc";
-
-
 	$mysql = mysqli_init();
 
 	/* following operations should not work */
@@ -24,12 +21,10 @@ Bug #36802 (crashes with with mysqli_set_charset())
 	}
 	$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);
 ?>

ext/mysqli/tests/bug36949.phpt

@@ -50,7 +50,7 @@ $B = new B();
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS my_time"))

ext/mysqli/tests/bug37090.phpt

@@ -15,7 +15,7 @@ if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
 <?php
 	include "connect.inc";
 
-	$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
 	$cs = array();
 	$cs[] = $mysql->set_charset("latin1");

ext/mysqli/tests/bug38710.phpt

@@ -1,15 +1,15 @@
 --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";
 
-$db = new mysqli($host, $user, $passwd, $db, $port, $socket);
+$db = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 $qry=$db->stmt_init();
 $qry->prepare("SELECT REPEAT('a',100000)");
 $qry->execute();
@@ -20,5 +20,5 @@ if ($text !== str_repeat('a', ($IS_MYSQLND || mysqli_get_server_version($db) > 5
 }
 echo "Done";
 ?>
---EXPECTF--	
+--EXPECTF--
 Done

ext/mysqli/tests/bug42378.phpt

@@ -152,7 +152,7 @@ memory_limit=83886080
 		return true;
 	}
 
-	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
 		printf("[001] Cannot connect - [%d] %s\n",
 			mysqli_connect_errno(),
 			mysqli_connect_error());

ext/mysqli/tests/bug42548.phpt

@@ -5,7 +5,7 @@ Bug #42548 PROCEDURE xxx can't return a result set in the given context (works i
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
 	die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (mysqli_get_server_version($link) <= 50000) {
@@ -53,7 +53,7 @@ print "done!";
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 mysqli_query($link, "DROP PROCEDURE IF EXISTS p1");

ext/mysqli/tests/bug44897.phpt

@@ -10,7 +10,7 @@ if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
 	die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (mysqli_get_server_version($link) <= 50000) {
@@ -75,7 +75,7 @@ if (mysqli_get_server_version($link) <= 50000) {
 --CLEAN--
 <?php
 include "connect.inc";
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))

ext/mysqli/tests/bug47050.phpt

@@ -12,7 +12,7 @@ if (!defined("MYSQLI_ASYNC")) {
 <?php
 	include ("connect.inc");
 
-	$link1 = mysqli_connect($host, $user, $passwd, null, $port, $socket);
+	$link1 = my_mysqli_connect($host, $user, $passwd, null, $port, $socket);
 	mysqli_select_db($link1, $db);
 
 	$link1->query("SELECT 'test'", MYSQLI_ASYNC);

ext/mysqli/tests/bug48909.phpt

@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 <?php
 	include "connect.inc";
 
-	if (!($link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)))
+	if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)))
 		printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
 			$host, $user, $db, $port, $socket);
 

ext/mysqli/tests/bug49027.phpt

@@ -14,7 +14,7 @@ require_once('skipifconnectfailure.inc');
 		printf("[001] Cannot set INIT_COMMAND\n");
 	}
 
-	if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
+	if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
 		printf("[002] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 	}
 
@@ -32,7 +32,7 @@ require_once('skipifconnectfailure.inc');
 		printf("[004] Cannot set INIT_COMMAND\n");
 	}
 
-	if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
+	if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
 		printf("[005] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 	}
 

ext/mysqli/tests/bug49442.phpt

@@ -14,7 +14,7 @@ mysqli.max_persistent=1
 	include ("connect.inc");
 
 	$link = mysqli_init();
-	if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
+	if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
 		printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 	}
 
@@ -63,7 +63,7 @@ mysqli.max_persistent=1
 			pconnect or mysql_init() - so we should test pconnect as well..
 		*/
 		$host = 'p:' . $host;
-		if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+		if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
 			printf("[007] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 		}
 

ext/mysqli/tests/clean_table.inc

@@ -1,7 +1,7 @@
 <?PHP
 require_once('connect.inc');
 
-if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
 	printf("[clean] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
 		$host, $user, $db, $port, $socket);
 }

ext/mysqli/tests/connect.inc

@@ -16,6 +16,7 @@
 	$engine    = getenv("MYSQL_TEST_ENGINE")   ? getenv("MYSQL_TEST_ENGINE") : "MyISAM";
 	$socket    = getenv("MYSQL_TEST_SOCKET")   ? getenv("MYSQL_TEST_SOCKET") : null;
 	$skip_on_connect_failure  = getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") ? getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") : true;
+	$test_compress = getenv("MYSQL_TEST_COMPRESS") ? (boolean)getenv("MYSQL_TEST_COMPRESS") : false;
 
 	/* Development setting: test experimal features and/or feature requests that never worked before? */
 	$TEST_EXPERIMENTAL = (in_array(getenv("MYSQL_TEST_EXPERIMENTAL"), array(0, 1))) ?
@@ -71,4 +72,55 @@
 			return FALSE;
 		}
 	}
+
+	/**
+	* Whenever possible, please use this wrapper to make testing ot MYSQLI_CLIENT_COMPRESS (and potentially SSL) possible
+	*
+	* @param compress mixed: -1 => use global default, false -> no compression, true -> compression
+	*/
+	function my_mysqli_connect($host, $user, $passwd, $db, $port, $socket, $compress = -1) {
+		global $test_compress;
+
+		if (-1 == $compress)
+			$compress = $test_compress;
+
+		if ($compress) {
+			$link = mysqli_init();
+			mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, 0 & MYSQLI_CLIENT_COMPRESS);
+		} else {
+			$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+		}
+
+		return $link;
+	}
+
+	/**
+	* Whenever possible, please use this wrapper to make testing ot MYSQLI_CLIENT_COMPRESS (and potentially SSL) possible
+	*
+	* @param compress mixed: -1 => use global default, false -> no compression, true -> compression
+	*/
+	function my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags = 0, $compress = -1) {
+		global $test_compress;
+
+		if (-1 == $compress)
+			$compress = $test_compress;
+
+		return mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags & MYSQLI_CLIENT_COMPRESS);
+	}
+
+	class my_mysqli extends mysqli {
+		public function __construct($host, $user, $passwd, $db, $port, $socket, $compress = -1) {
+			global $test_compress;
+
+			if (-1 == $compress)
+				$compress = $test_compress;
+
+			if ($compress) {
+				parent::init();
+				$this->real_connect($host, $user, $passwd, $db, $port, $socket, 0 & MYSQLI_CLIENT_COMPRESS);
+			} else {
+				parent::__construct($host, $user, $passwd, $db, $port, $socket);
+			}
+		}
+	}
 ?>

ext/mysqli/tests/mysqli_affected_rows.phpt

@@ -22,7 +22,7 @@ mysqli_affected_rows()
 	if (!is_null($tmp = @mysqli_affected_rows($link, $link)))
 		printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
 		printf("[004] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
 			$host, $user, $db, $port, $socket);
 

ext/mysqli/tests/mysqli_affected_rows_oo.phpt

@@ -14,7 +14,7 @@ mysqli->affected_rows
 	if (NULL !== ($tmp = @$mysqli->affected_rows))
 		printf("[000a] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-	if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) {
+	if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) {
 		printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
 			$host, $user, $db, $port, $socket);
 	}

ext/mysqli/tests/mysqli_autocommit.phpt

@@ -7,7 +7,7 @@ mysqli_autocommit()
 	require_once('connect.inc');
 	require_once('skipifconnectfailure.inc');
 
-	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+	if (!$link = my_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));
 	}
@@ -40,7 +40,7 @@ mysqli_autocommit()
 	if (!is_null($tmp = @mysqli_autocommit($link, $link, $link)))
 		printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
 		printf("[004] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
 			$host, $user, $db, $port, $socket);
 	}

ext/mysqli/tests/mysqli_autocommit_oo.phpt

@@ -7,7 +7,7 @@ mysqli->autocommit()
 	require_once('skipifconnectfailure.inc');
 	require_once('connect.inc');
 
-	if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) {
+	if (!$mysqli = new my_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);
 		exit(1);
@@ -31,7 +31,7 @@ mysqli->autocommit()
 <?php
 	include "connect.inc";
 
-	if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) {
+	if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) {
 		printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
 			$host, $user, $db, $port, $socket);
 	}

ext/mysqli/tests/mysqli_change_user.phpt

@@ -2,7 +2,7 @@
 mysqli_change_user()
 --SKIPIF--
 <?php
-require_once('skipif.inc'); 
+require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
@@ -28,7 +28,7 @@ require_once('skipifconnectfailure.inc');
 	if (!is_null($tmp = @mysqli_change_user($link, $link, $link, $link, $link)))
 		printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
 		printf("[006] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
 			$host, $user, $db, $port, $socket);
 

ext/mysqli/tests/mysqli_change_user_get_lock.phpt

@@ -70,7 +70,7 @@ sleep(5);
 
 	/* Ok, let's try a NEW connection and a NEW lock! */
 	mysqli_close($link);
-	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
 		printf("[010] Cannot open new connection, [%d] %s\n",
 			mysqli_connect_errno(), mysqli_connect_error());