From 6db67fe4ffc29c7eacc58b6bcbe62aff3dace294 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@php.net>
Date: Sat, 4 Dec 2004 09:01:34 +0000
Subject: [PATCH] MFH: 	fix for bug #28817 (properties don't work in extended
 class) 	fix for bug #30890 (testsuite)

---
 ext/mysqli/mysqli.c            |  6 +-----
 ext/mysqli/mysqli_prop.c       | 36 ++++++++++++++++++----------------
 ext/mysqli/tests/001.phpt      | 27 +++++++++----------------
 ext/mysqli/tests/002.phpt      |  4 +++-
 ext/mysqli/tests/003.phpt      |  4 +++-
 ext/mysqli/tests/004.phpt      |  4 +++-
 ext/mysqli/tests/005.phpt      |  4 +++-
 ext/mysqli/tests/006.phpt      |  4 +++-
 ext/mysqli/tests/007.phpt      |  4 +++-
 ext/mysqli/tests/008.phpt      |  4 +++-
 ext/mysqli/tests/009.phpt      |  4 +++-
 ext/mysqli/tests/010.phpt      |  4 +++-
 ext/mysqli/tests/011.phpt      |  4 +++-
 ext/mysqli/tests/012.phpt      |  4 +++-
 ext/mysqli/tests/013.phpt      |  4 +++-
 ext/mysqli/tests/014.phpt      |  6 ++++--
 ext/mysqli/tests/015.phpt      |  6 ++++--
 ext/mysqli/tests/016.phpt      |  4 +++-
 ext/mysqli/tests/017.phpt      | 10 +++++++---
 ext/mysqli/tests/018.phpt      |  4 +++-
 ext/mysqli/tests/019.phpt      |  4 +++-
 ext/mysqli/tests/020.phpt      |  4 +++-
 ext/mysqli/tests/021.phpt      |  4 +++-
 ext/mysqli/tests/022.phpt      |  4 +++-
 ext/mysqli/tests/023.phpt      |  4 +++-
 ext/mysqli/tests/024.phpt      |  4 +++-
 ext/mysqli/tests/025.phpt      |  4 +++-
 ext/mysqli/tests/026.phpt      |  8 ++++----
 ext/mysqli/tests/027.phpt      |  8 ++++----
 ext/mysqli/tests/028.phpt      |  8 ++++----
 ext/mysqli/tests/029.phpt      |  8 ++++----
 ext/mysqli/tests/030.phpt      |  7 ++++---
 ext/mysqli/tests/031.phpt      |  7 ++++---
 ext/mysqli/tests/032.phpt      |  8 ++++----
 ext/mysqli/tests/033.phpt      |  8 ++++----
 ext/mysqli/tests/034.phpt      |  8 ++++----
 ext/mysqli/tests/035.phpt      |  8 ++++----
 ext/mysqli/tests/036.phpt      |  4 +++-
 ext/mysqli/tests/037.phpt      |  4 +++-
 ext/mysqli/tests/038.phpt      |  4 +++-
 ext/mysqli/tests/039.phpt      |  4 +++-
 ext/mysqli/tests/040.phpt      |  4 +++-
 ext/mysqli/tests/041.phpt      |  4 +++-
 ext/mysqli/tests/042.phpt      |  4 +++-
 ext/mysqli/tests/043.phpt      |  4 +++-
 ext/mysqli/tests/044.phpt      |  4 +++-
 ext/mysqli/tests/045.phpt      |  6 ++++--
 ext/mysqli/tests/046.phpt      |  4 +++-
 ext/mysqli/tests/047.phpt      |  4 +++-
 ext/mysqli/tests/048.phpt      |  4 +++-
 ext/mysqli/tests/049.phpt      | 14 ++++++-------
 ext/mysqli/tests/050.phpt      |  4 +++-
 ext/mysqli/tests/051.phpt      |  4 +++-
 ext/mysqli/tests/052.phpt      |  4 +++-
 ext/mysqli/tests/053.phpt      |  4 +++-
 ext/mysqli/tests/054.phpt      |  4 +++-
 ext/mysqli/tests/055.phpt      |  4 +++-
 ext/mysqli/tests/056.phpt      |  4 +++-
 ext/mysqli/tests/057.phpt      |  4 +++-
 ext/mysqli/tests/058.phpt      |  4 +++-
 ext/mysqli/tests/059.phpt      |  4 +++-
 ext/mysqli/tests/060.phpt      |  4 +++-
 ext/mysqli/tests/061.phpt      |  4 +++-
 ext/mysqli/tests/bug29311.phpt | 10 +++++++---
 ext/mysqli/tests/bug30967.phpt |  4 +++-
 65 files changed, 240 insertions(+), 143 deletions(-)

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 833d8a5d07..96a56ae9dc 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -179,11 +179,6 @@ zval *mysqli_read_property(zval *object, zval *member, int type TSRMLS_DC)
 	ret = FAILURE;
 	obj = (mysqli_object *)zend_objects_get_address(object TSRMLS_CC);
 
-	if (!obj->valid) {
-		retval = EG(uninitialized_zval_ptr);
-		return(retval);
-	}
-
  	if (member->type != IS_STRING) {
 		tmp_member = *member;
 		zval_copy_ctor(&tmp_member);
@@ -223,6 +218,7 @@ zval *mysqli_read_property(zval *object, zval *member, int type TSRMLS_DC)
 	} else {
 		std_hnd = zend_get_std_object_handlers();
 		retval = std_hnd->read_property(object, member, type TSRMLS_CC);
+		retval->refcount = 1;
 	}
 
 	if (member == &tmp_member) {
diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c
index 6ad8875680..f883e72de6 100644
--- a/ext/mysqli/mysqli_prop.c
+++ b/ext/mysqli/mysqli_prop.c
@@ -29,6 +29,15 @@
 #include "ext/standard/info.h"
 #include "php_mysqli.h"
 
+#define CHECK_OBJECT() \
+	if (!obj->valid) { \
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Property access is not allowed yet. Call the default constructor of the object first"); \
+		ZVAL_NULL(*retval); \
+		return SUCCESS; \
+	} \
+
+
+
 #define MYSQLI_GET_MYSQL() \
 MYSQL *p = (MYSQL *)((MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr)->mysql;
 
@@ -41,9 +50,10 @@ MYSQL_STMT *p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr)-
 #define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type, __ret_type)\
 int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
 {\
+	ALLOC_ZVAL(*retval); \
+	CHECK_OBJECT(); \
 	__ret_type l;\
 	__get_type;\
-	ALLOC_ZVAL(*retval);\
 	if (!p) {\
 		ZVAL_NULL(*retval);\
 	} else {\
@@ -63,8 +73,9 @@ int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
 int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
 {\
 	char *c;\
+	ALLOC_ZVAL(*retval); \
+	CHECK_OBJECT(); \
 	__get_type;\
-	ALLOC_ZVAL(*retval);\
 	if (!p) {\
 		ZVAL_NULL(*retval);\
 	} else {\
@@ -96,19 +107,6 @@ int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ property link_test_read */
-int link_test_read(mysqli_object *obj, zval **retval TSRMLS_DC)
-{
-	long	i;
-	ALLOC_ZVAL(*retval);
-	array_init(*retval);
-
-	for (i=0; i < 10; i++)
-		add_index_long(*retval, i, i + 10);
-	return SUCCESS;
-}
-/*i }}} */
-
 /* {{{ property link_connect_errno_read */
 int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
@@ -147,9 +145,11 @@ MYSQLI_MAP_PROPERTY_FUNC_LONG(link_warning_count_read, mysql_warning_count, MYSQ
 /* {{{ property result_type_read */
 int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
+	ALLOC_ZVAL(*retval); 
+	CHECK_OBJECT();
+
 	MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;
 
-	ALLOC_ZVAL(*retval);
 	if (!p) {
 		ZVAL_NULL(*retval);
 	} else {
@@ -162,6 +162,9 @@ int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 /* {{{ property result_lengths_read */
 int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
+	ALLOC_ZVAL(*retval); 
+	CHECK_OBJECT();
+
 	MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;
 
 	ALLOC_ZVAL(*retval);
@@ -202,7 +205,6 @@ mysqli_property_entry mysqli_link_property_entries[] = {
 	{"affected_rows", link_affected_rows_read, NULL},
 	{"client_info", link_client_info_read, NULL},
 	{"client_version", link_client_version_read, NULL},
-	{"test", link_test_read, NULL},
 	{"connect_errno", link_connect_errno_read, NULL},
 	{"connect_error", link_connect_error_read, NULL},
 	{"errno", link_errno_read, NULL},
diff --git a/ext/mysqli/tests/001.phpt b/ext/mysqli/tests/001.phpt
index 5e483aba8d..880325bb5a 100644
--- a/ext/mysqli/tests/001.phpt
+++ b/ext/mysqli/tests/001.phpt
@@ -1,49 +1,40 @@
 --TEST--
 mysqli connect
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
+	include "connect.inc";
 
-	$user = "root";
-	$passwd = "";
 	$dbname = "test";
 	$test = "";
 	
-	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("127.0.0.1", $user, $passwd);
-	$test .= ($link) ? "1" : "0";
-	mysqli_close($link);
-
-	/*** test mysqli_connect localhost ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
-	$test .= ($link) ? "1" : "0";
-	mysqli_close($link);
-
 	/*** test mysqli_connect localhost:port ***/
-	$link = mysqli_connect("localhost", $user, $passwd, "", 3306);
+	$link = mysqli_connect($host, $user, $passwd, "", 3306);
 	$test .= ($link) ? "1" : "0";
 	mysqli_close($link);
 
 	/*** test mysqli_real_connect ***/
 	$link = mysqli_init();	
-	$test.= (mysqli_real_connect($link, "localhost", $user, $passwd)) 
+	$test.= (mysqli_real_connect($link, $host, $user, $passwd)) 
 		? "1" : "0";
 	mysqli_close($link);
 
 	/*** test mysqli_real_connect with db ***/
 	$link = mysqli_init();	
-	$test .= (mysqli_real_connect($link, "localhost", $user, $passwd, $dbname)) 
+	$test .= (mysqli_real_connect($link, $host, $user, $passwd, $dbname)) 
 		? "1" : "0";
 	mysqli_close($link);
 
 	/*** test mysqli_real_connect with port ***/
 	$link = mysqli_init();	
-	$test .= (mysqli_real_connect($link, "localhost", $user, $passwd, $dbname, 3306))
+	$test .= (mysqli_real_connect($link, $host, $user, $passwd, $dbname, 3306))
 		? "1":"0";
 	mysqli_close($link);
 
 	/*** test mysqli_real_connect compressed ***/
 	$link = mysqli_init();	
-	$test .= (mysqli_real_connect($link, "localhost", $user, $passwd, $dbname, 0, NULL, MYSQLI_CLIENT_COMPRESS)) 
+	$test .= (mysqli_real_connect($link, $host, $user, $passwd, $dbname, 0, NULL, MYSQLI_CLIENT_COMPRESS)) 
 		? "1" : "0";
 	mysqli_close($link);
 
@@ -52,4 +43,4 @@ mysqli connect
 	var_dump($test);
 ?>
 --EXPECT--
-string(7) "1111111"
+string(5) "11111"
diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt
index 7925f84fa8..fa4e60e185 100644
--- a/ext/mysqli/tests/002.phpt
+++ b/ext/mysqli/tests/002.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli bind_result 1 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");		
 	$rc = mysqli_query($link,"DROP TABLE IF EXISTS test_fetch_null");
diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt
index 906bf28dec..d043dc7724 100644
--- a/ext/mysqli/tests/003.phpt
+++ b/ext/mysqli/tests/003.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli connect
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 		
diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt
index 179c4b64cf..c80c7214e3 100644
--- a/ext/mysqli/tests/004.phpt
+++ b/ext/mysqli/tests/004.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli fetch char/text 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include ("connect.inc");
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt
index 982a3950f2..a9f75cfd7e 100644
--- a/ext/mysqli/tests/005.phpt
+++ b/ext/mysqli/tests/005.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli fetch char/text long 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/006.phpt b/ext/mysqli/tests/006.phpt
index d697e1e82f..4b495cc594 100644
--- a/ext/mysqli/tests/006.phpt
+++ b/ext/mysqli/tests/006.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli fetch long values
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/007.phpt b/ext/mysqli/tests/007.phpt
index 2470c20e7e..503863bdc2 100644
--- a/ext/mysqli/tests/007.phpt
+++ b/ext/mysqli/tests/007.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli fetch short values
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/008.phpt b/ext/mysqli/tests/008.phpt
index c0ee735096..12311d621b 100644
--- a/ext/mysqli/tests/008.phpt
+++ b/ext/mysqli/tests/008.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli fetch tinyint values
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt
index 042f837849..6b8f57b203 100644
--- a/ext/mysqli/tests/009.phpt
+++ b/ext/mysqli/tests/009.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli fetch bigint values
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt
index 4584e0a91f..0d74bed501 100644
--- a/ext/mysqli/tests/010.phpt
+++ b/ext/mysqli/tests/010.phpt
@@ -2,12 +2,14 @@
 mysqli fetch float values
 --INI--
 precision=12
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt
index 987ec1d14a..77a157f564 100644
--- a/ext/mysqli/tests/011.phpt
+++ b/ext/mysqli/tests/011.phpt
@@ -2,12 +2,14 @@
 mysqli fetch mixed values
 --INI--
 precision=12
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt
index 9af509fefd..9c52f9c3e4 100644
--- a/ext/mysqli/tests/012.phpt
+++ b/ext/mysqli/tests/012.phpt
@@ -2,12 +2,14 @@
 mysqli fetch mixed values 2
 --INI--
 precision=12
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt
index b095419199..ff435f94db 100644
--- a/ext/mysqli/tests/013.phpt
+++ b/ext/mysqli/tests/013.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli fetch mixed / mysql_query 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt
index 8a72c42c7f..69c347b88b 100644
--- a/ext/mysqli/tests/014.phpt
+++ b/ext/mysqli/tests/014.phpt
@@ -3,7 +3,7 @@ mysqli autocommit/commit/rollback
 --SKIPIF--
 <?php	
 	include "connect.inc";
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 	$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'");
 	$row = mysqli_fetch_row($result);
 	mysqli_free_result($result);
@@ -13,10 +13,12 @@ mysqli autocommit/commit/rollback
 		printf ("skip innodb support is not installed or enabled.");
 	}
 ?>
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt
index 96864e8854..26eb4383c9 100644
--- a/ext/mysqli/tests/015.phpt
+++ b/ext/mysqli/tests/015.phpt
@@ -3,7 +3,7 @@ mysqli autocommit/commit/rollback with myisam
 --SKIPIF--
 <?php	
 	include "connect.inc";
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 	$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'");
 	$row = mysqli_fetch_row($result);
 	mysqli_free_result($result);
@@ -13,11 +13,13 @@ mysqli autocommit/commit/rollback with myisam
 		printf ("skip innodb support not installed.");
 	}
 ?>
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt
index 4d16356a78..c61da29ec1 100644
--- a/ext/mysqli/tests/016.phpt
+++ b/ext/mysqli/tests/016.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli fetch user variable 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt
index 3447614428..7f51ca4b91 100644
--- a/ext/mysqli/tests/017.phpt
+++ b/ext/mysqli/tests/017.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli fetch functions 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
@@ -14,7 +16,9 @@ mysqli fetch functions
 	mysqli_execute($stmt);
 
 	mysqli_fetch($stmt);
-//	mysqli_stmt_close($stmt);
+	mysqli_stmt_close($stmt);
+
+	$c0 = ($c0 == $user . "@" . $host) ? 1 : 0;
 
 	$test = array($c0, $c1, $c2);
 
@@ -24,7 +28,7 @@ mysqli fetch functions
 --EXPECT--
 array(3) {
   [0]=>
-  string(14) "root@localhost"
+  int(1)
   [1]=>
   string(4) "test"
   [2]=>
diff --git a/ext/mysqli/tests/018.phpt b/ext/mysqli/tests/018.phpt
index a0a247611d..4ba199d866 100644
--- a/ext/mysqli/tests/018.phpt
+++ b/ext/mysqli/tests/018.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli fetch system variables
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt
index f7aab7a799..41b1ba2cf9 100644
--- a/ext/mysqli/tests/019.phpt
+++ b/ext/mysqli/tests/019.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli fetch (bind_param + bind_result) 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");		
 	$rc = mysqli_query($link,"DROP TABLE IF EXISTS insert_read");
diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt
index d08930fed9..85834c52af 100644
--- a/ext/mysqli/tests/020.phpt
+++ b/ext/mysqli/tests/020.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli bind_param/bind_result date
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 		
diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt
index 614f978aaf..6f5bad3205 100644
--- a/ext/mysqli/tests/021.phpt
+++ b/ext/mysqli/tests/021.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli bind_param+bind_result char/text 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt
index 2fb2bcdb62..cce8ed8eb6 100644
--- a/ext/mysqli/tests/022.phpt
+++ b/ext/mysqli/tests/022.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli bind_param/bind_result char/text long 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt
index 258f1852d0..69e9b20858 100644
--- a/ext/mysqli/tests/023.phpt
+++ b/ext/mysqli/tests/023.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli bind_param/bind_prepare fetch long values
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt
index de0eead6ed..c6d6cd7e70 100644
--- a/ext/mysqli/tests/024.phpt
+++ b/ext/mysqli/tests/024.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli bind_param/bind_result short values
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt
index 3d643ad872..85ff0fa29f 100644
--- a/ext/mysqli/tests/025.phpt
+++ b/ext/mysqli/tests/025.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli bind_param/bind_result tinyint values
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt
index 2c7f9f02bd..0f9e882608 100644
--- a/ext/mysqli/tests/026.phpt
+++ b/ext/mysqli/tests/026.phpt
@@ -1,13 +1,13 @@
 --TEST--
 mysqli bind_param/bind_result with send_long_data 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-	$user = "root";
-	$passwd = "";
-
+	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/027.phpt b/ext/mysqli/tests/027.phpt
index 347a8513af..9f8eadf9dd 100644
--- a/ext/mysqli/tests/027.phpt
+++ b/ext/mysqli/tests/027.phpt
@@ -1,13 +1,13 @@
 --TEST--
 function test: mysqli_stat
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-	$user = "root";
-	$passwd = "";
-
+	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$status = mysqli_stat($link);
 
diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt
index d9e848f2ba..021804540d 100644
--- a/ext/mysqli/tests/028.phpt
+++ b/ext/mysqli/tests/028.phpt
@@ -1,13 +1,13 @@
 --TEST--
 function test: mysqli_character_set_name
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-	$user = "root";
-	$passwd = "";
-
+	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$cset = substr(mysqli_character_set_name($link),0,6);
 
diff --git a/ext/mysqli/tests/029.phpt b/ext/mysqli/tests/029.phpt
index 7680b228e9..318e6aeb9e 100644
--- a/ext/mysqli/tests/029.phpt
+++ b/ext/mysqli/tests/029.phpt
@@ -1,13 +1,13 @@
 --TEST--
 function test: mysqli_affected_rows
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-	$user = "root";
-	$passwd = "";
-
+	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/030.phpt b/ext/mysqli/tests/030.phpt
index da87218627..a3946c3715 100644
--- a/ext/mysqli/tests/030.phpt
+++ b/ext/mysqli/tests/030.phpt
@@ -1,12 +1,13 @@
 --TEST--
 function test: mysqli_errno
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-	$user = "root";
-	$passwd = "";
+	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 	$errno = mysqli_errno($link);
 	var_dump($errno);
 
diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt
index 61bfb5bb32..743b4b2d0f 100644
--- a/ext/mysqli/tests/031.phpt
+++ b/ext/mysqli/tests/031.phpt
@@ -1,12 +1,13 @@
 --TEST--
 function test: mysqli_error
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-	$user = "root";
-	$passwd = "";
+	include "connect.inc";
 
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 	$error = mysqli_error($link);
 	var_dump($error);
 
diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt
index 02564834d8..18bd756a23 100644
--- a/ext/mysqli/tests/032.phpt
+++ b/ext/mysqli/tests/032.phpt
@@ -1,13 +1,13 @@
 --TEST--
 function test: mysqli_info
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-	$user = "root";
-	$passwd = "";
-
+	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/033.phpt b/ext/mysqli/tests/033.phpt
index e3d8d159d0..3a56b5c678 100644
--- a/ext/mysqli/tests/033.phpt
+++ b/ext/mysqli/tests/033.phpt
@@ -1,13 +1,13 @@
 --TEST--
 function test: mysqli_get_host_info
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-	$user = "root";
-	$passwd = "";
-
+	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$hinfo = mysqli_get_host_info($link);
 
diff --git a/ext/mysqli/tests/034.phpt b/ext/mysqli/tests/034.phpt
index e347586a36..47c99f07e5 100644
--- a/ext/mysqli/tests/034.phpt
+++ b/ext/mysqli/tests/034.phpt
@@ -1,13 +1,13 @@
 --TEST--
 function test: mysqli_get_proto_info
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-	$user = "root";
-	$passwd = "";
-
+	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$pinfo = mysqli_get_proto_info($link);
 
diff --git a/ext/mysqli/tests/035.phpt b/ext/mysqli/tests/035.phpt
index a02af059d8..ea31222ec7 100644
--- a/ext/mysqli/tests/035.phpt
+++ b/ext/mysqli/tests/035.phpt
@@ -1,13 +1,13 @@
 --TEST--
 function test: mysqli_get_server_info
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-	$user = "root";
-	$passwd = "";
-
+	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$sinfo = substr(mysqli_get_server_info($link),0,1);
 
diff --git a/ext/mysqli/tests/036.phpt b/ext/mysqli/tests/036.phpt
index 080c6e32e4..58d27b481e 100644
--- a/ext/mysqli/tests/036.phpt
+++ b/ext/mysqli/tests/036.phpt
@@ -1,12 +1,14 @@
 --TEST--
 function test: mysqli_insert_id()
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/037.phpt b/ext/mysqli/tests/037.phpt
index f8b8a13f1a..c9089c19be 100644
--- a/ext/mysqli/tests/037.phpt
+++ b/ext/mysqli/tests/037.phpt
@@ -1,12 +1,14 @@
 --TEST--
 function test: mysqli_field_count()
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/038.phpt b/ext/mysqli/tests/038.phpt
index 858b3e3393..ecd4f908f1 100644
--- a/ext/mysqli/tests/038.phpt
+++ b/ext/mysqli/tests/038.phpt
@@ -1,12 +1,14 @@
 --TEST--
 function test: mysqli_num_fields()
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/039.phpt b/ext/mysqli/tests/039.phpt
index 6ddb37bc5f..1d5ab99106 100644
--- a/ext/mysqli/tests/039.phpt
+++ b/ext/mysqli/tests/039.phpt
@@ -1,12 +1,14 @@
 --TEST--
 function test: mysqli_num_fields() 2
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_real_query($link, "SHOW VARIABLES");
 
diff --git a/ext/mysqli/tests/040.phpt b/ext/mysqli/tests/040.phpt
index 477e2a5274..79bfe0d5fb 100644
--- a/ext/mysqli/tests/040.phpt
+++ b/ext/mysqli/tests/040.phpt
@@ -1,12 +1,14 @@
 --TEST--
 function test: mysqli_num_rows()
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/041.phpt b/ext/mysqli/tests/041.phpt
index 6fb8ee7e3f..e78c60a956 100644
--- a/ext/mysqli/tests/041.phpt
+++ b/ext/mysqli/tests/041.phpt
@@ -1,12 +1,14 @@
 --TEST--
 function test: mysqli_warning_count()
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt
index 8db17138c0..fe6d23e172 100644
--- a/ext/mysqli/tests/042.phpt
+++ b/ext/mysqli/tests/042.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli_fetch_object
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt
index 7aae6df9b4..fb0284e06a 100644
--- a/ext/mysqli/tests/043.phpt
+++ b/ext/mysqli/tests/043.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli_bind_param (UPDATE)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/044.phpt b/ext/mysqli/tests/044.phpt
index 5f72f65e38..28e73a7e09 100644
--- a/ext/mysqli/tests/044.phpt
+++ b/ext/mysqli/tests/044.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli_get_server_version
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$i = mysqli_get_server_version($link);
 
diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt
index dc58bcfb08..5a6efeafb7 100644
--- a/ext/mysqli/tests/045.phpt
+++ b/ext/mysqli/tests/045.phpt
@@ -3,7 +3,7 @@ mysqli_bind_result (SHOW)
 --SKIPIF--
 <?php	
 	include "connect.inc";
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 
 	$stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
@@ -15,12 +15,14 @@ mysqli_bind_result (SHOW)
 	$stmt->close();
 	mysqli_close($link);
 ?>
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
 	mysqli_execute($stmt);
diff --git a/ext/mysqli/tests/046.phpt b/ext/mysqli/tests/046.phpt
index bd6bc0efdb..e88348bfa9 100644
--- a/ext/mysqli/tests/046.phpt
+++ b/ext/mysqli/tests/046.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli_stmt_affected_rows (delete)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt
index 7862846dc0..56acddd688 100644
--- a/ext/mysqli/tests/047.phpt
+++ b/ext/mysqli/tests/047.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli_get_metadata
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt
index 102bcdfc26..1cf5b67894 100644
--- a/ext/mysqli/tests/048.phpt
+++ b/ext/mysqli/tests/048.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli bind_result (OO-Style) 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$mysql = mysqli_connect("localhost", $user, $passwd);
+	$mysql = mysqli_connect($host, $user, $passwd);
 
 	$mysql->select_db("test");		
 	$mysql->query("DROP TABLE IF EXISTS test_fetch_null");
diff --git a/ext/mysqli/tests/049.phpt b/ext/mysqli/tests/049.phpt
index 04e705de6e..13ea5594c3 100644
--- a/ext/mysqli/tests/049.phpt
+++ b/ext/mysqli/tests/049.phpt
@@ -1,23 +1,23 @@
 --TEST--
 mysql_fetch_row (OO-Style) 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$mysql = mysqli_connect("localhost", $user, $passwd);
+	$mysql = mysqli_connect($host, $user, $passwd);
 
 	$mysql->select_db("test");		
 	$result = $mysql->query("SELECT CURRENT_USER()");
 	$row = $result->fetch_row();
 	$result->close();
-	
-	var_dump($row);
+
+	$ok = ($row[0] == $user . "@" . $host);	
+	var_dump($ok);
 
 	$mysql->close();
 ?>
 --EXPECT--
-array(1) {
-  [0]=>
-  string(14) "root@localhost"
-}
+bool(true)
diff --git a/ext/mysqli/tests/050.phpt b/ext/mysqli/tests/050.phpt
index 9ab5d346f8..5f923ccf34 100644
--- a/ext/mysqli/tests/050.phpt
+++ b/ext/mysqli/tests/050.phpt
@@ -1,5 +1,7 @@
 --TEST--
 non freed statement test 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
@@ -7,7 +9,7 @@ non freed statement test
 	/************************
 	 * non freed stamement
 	 ************************/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$stmt = mysqli_prepare($link, "SELECT CURRENT_USER()");
 	mysqli_execute($stmt);
diff --git a/ext/mysqli/tests/051.phpt b/ext/mysqli/tests/051.phpt
index dde734a1e0..ef378757f1 100644
--- a/ext/mysqli/tests/051.phpt
+++ b/ext/mysqli/tests/051.phpt
@@ -1,5 +1,7 @@
 --TEST--
 free statement after close 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
@@ -7,7 +9,7 @@ free statement after close
 	/************************
 	 * free statement after close 
 	 ************************/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$stmt1 = mysqli_prepare($link, "SELECT CURRENT_USER()");
 	mysqli_execute($stmt1);
diff --git a/ext/mysqli/tests/052.phpt b/ext/mysqli/tests/052.phpt
index 4ae9b12c50..3fa5dc8f17 100644
--- a/ext/mysqli/tests/052.phpt
+++ b/ext/mysqli/tests/052.phpt
@@ -1,5 +1,7 @@
 --TEST--
 call statement after close
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
@@ -7,7 +9,7 @@ call statement after close
 	/************************
 	 * statement call  after close 
 	 ************************/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$stmt2 = mysqli_prepare($link, "SELECT CURRENT_USER()");
 
diff --git a/ext/mysqli/tests/053.phpt b/ext/mysqli/tests/053.phpt
index f542d0f099..99148c7e80 100644
--- a/ext/mysqli/tests/053.phpt
+++ b/ext/mysqli/tests/053.phpt
@@ -1,5 +1,7 @@
 --TEST--
 not freed resultset 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
@@ -7,7 +9,7 @@ not freed resultset
 	/************************
 	 * non freed resultset 
 	 ************************/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$result = mysqli_query($link, "SELECT CURRENT_USER()");
 	mysqli_close($link);
diff --git a/ext/mysqli/tests/054.phpt b/ext/mysqli/tests/054.phpt
index eab207db4d..727b87ef8e 100644
--- a/ext/mysqli/tests/054.phpt
+++ b/ext/mysqli/tests/054.phpt
@@ -1,5 +1,7 @@
 --TEST--
 free resultset after close 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
@@ -7,7 +9,7 @@ free resultset after close
 	/************************
 	 * free resultset after close 
 	 ************************/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$result1 = mysqli_query($link, "SELECT CURRENT_USER()");
 	mysqli_close($link);
diff --git a/ext/mysqli/tests/055.phpt b/ext/mysqli/tests/055.phpt
index e777bcfc99..e650dbcecd 100644
--- a/ext/mysqli/tests/055.phpt
+++ b/ext/mysqli/tests/055.phpt
@@ -1,5 +1,7 @@
 --TEST--
 free nothing 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
@@ -7,7 +9,7 @@ free nothing
 	/************************
 	 * don't free anything 
 	 ************************/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	$result2 = mysqli_query($link, "SELECT CURRENT_USER()");
 	$stmt2 = mysqli_prepare($link, "SELECT CURRENT_USER()");
diff --git a/ext/mysqli/tests/056.phpt b/ext/mysqli/tests/056.phpt
index cee7df1e5f..cc5c32fc60 100644
--- a/ext/mysqli/tests/056.phpt
+++ b/ext/mysqli/tests/056.phpt
@@ -1,5 +1,7 @@
 --TEST--
 extend mysqli 
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
@@ -11,7 +13,7 @@ extend mysqli
 	}
 
 	$foo = new foobar();
-	$foo->connect("localhost", $user, $passwd);
+	$foo->connect($host, $user, $passwd);
 	$foo->close();
 	printf("%s\n", $foo->test());
 ?>
diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt
index 581201d8ef..a987c72381 100644
--- a/ext/mysqli/tests/057.phpt
+++ b/ext/mysqli/tests/057.phpt
@@ -1,11 +1,13 @@
 --TEST--
 mysqli_get_metadata
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt
index d46e8d65a8..7554d08f68 100644
--- a/ext/mysqli/tests/058.phpt
+++ b/ext/mysqli/tests/058.phpt
@@ -1,11 +1,13 @@
 --TEST--
 multiple binds
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt
index 80d8a35012..0bc8a62bbf 100644
--- a/ext/mysqli/tests/059.phpt
+++ b/ext/mysqli/tests/059.phpt
@@ -1,11 +1,13 @@
 --TEST--
 sqlmode + bind
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/060.phpt b/ext/mysqli/tests/060.phpt
index f7afaa7e1a..875130dc55 100644
--- a/ext/mysqli/tests/060.phpt
+++ b/ext/mysqli/tests/060.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mysqli_fetch_object with classes
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
@@ -11,7 +13,7 @@ mysqli_fetch_object with classes
 	}
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd);
+	$link = mysqli_connect($host, $user, $passwd);
 
 	mysqli_select_db($link, "test");
 
diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt
index 438f4a203a..9c278353c6 100644
--- a/ext/mysqli/tests/061.phpt
+++ b/ext/mysqli/tests/061.phpt
@@ -1,5 +1,7 @@
 --TEST--
 local infile handler
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
@@ -10,7 +12,7 @@ local infile handler
 	}
 	
 	/*** test mysqli_connect 127.0.0.1 ***/
-	$link = mysqli_connect("localhost", $user, $passwd, "test");
+	$link = mysqli_connect($host, $user, $passwd, "test");
 
 	/* create temporary file */
 	$fp = fopen("061.csv", "w");
diff --git a/ext/mysqli/tests/bug29311.phpt b/ext/mysqli/tests/bug29311.phpt
index 82845e16d6..b50de178b2 100644
--- a/ext/mysqli/tests/bug29311.phpt
+++ b/ext/mysqli/tests/bug29311.phpt
@@ -1,5 +1,7 @@
 --TEST--
 constructor test
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
@@ -7,7 +9,8 @@ constructor test
 	/* class 1 calls parent constructor */
 	class mysql1 extends mysqli {
 		function __construct() {
-			parent::__construct("localhost", "root", "", "test");
+			global $host, $user, $passwd;
+			parent::__construct($host, $user, $passwd, "test");
 		}
 	}
 
@@ -15,7 +18,8 @@ constructor test
 	class mysql2 extends mysqli {
 		
 		function __construct() {
-			$this->connect("localhost", "root", "", "test");
+			global $host, $user, $passwd;
+			$this->connect($host, $user, $passwd, "test");
 		}
 	}
 
@@ -26,7 +30,7 @@ constructor test
 
 	$foo[0] = new mysql1();	
 	$foo[1] = new mysql2();	
-	$foo[2] = new mysql3("localhost", "root", "", "test");
+	$foo[2] = new mysql3($host, $user, $passwd, "test");
 
 
 	for ($i=0; $i < 3; $i++) {
diff --git a/ext/mysqli/tests/bug30967.phpt b/ext/mysqli/tests/bug30967.phpt
index f441cf0f19..67c1fc22d1 100644
--- a/ext/mysqli/tests/bug30967.phpt
+++ b/ext/mysqli/tests/bug30967.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #30967 testcase (properties)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
@@ -10,7 +12,7 @@ Bug #30967 testcase (properties)
 	class mysql2 extends mysql1 {
 	}
 
-	$mysql = new mysql2("localhost", "root", "", "test");
+	$mysql = new mysql2($host, "root", "", "test");
 
 	$mysql->query("THIS DOES NOT WORK");
 	printf("%d\n", $mysql->errno);
-- 
2.40.0