cvs: php-src(PHP_5_0) /ext/mysqli mysqli.c mysqli_prop.c /ext/mysqli/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt
009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt
025.phpt 026.phpt 027.phpt 028.phpt 029.phpt 030.phpt 031.phpt 032.phpt 033.phpt 034.phpt 035.phpt 036.phpt 037.phpt 038.phpt 039.phpt 040.phpt
041.phpt 042.phpt 043.phpt 044.phpt 045.phpt 046.phpt 047.phpt 048.phpt 049.phpt 050.phpt 051.phpt 052.phpt 053.phpt 054.phpt 055.phpt 056.phpt
057.phpt 058.phpt 059.phpt 060.phpt 061.phpt bug29311.phpt bug30967.phpt
| From: | Georg Richter | Date: | Sat, 04 Dec 2004 09:01:34 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/mysqli mysqli.c mysqli_prop.c /ext/mysqli/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 027.phpt 028.phpt 029.phpt 030.phpt 031.phpt 032.phpt 033.phpt 034.phpt 035.phpt 036.phpt 037.phpt 038.phpt 039.phpt 040.phpt 041.phpt 042.phpt 043.phpt 044.phpt 045.phpt 046.phpt 047.phpt 048.phpt 049.phpt 050.phpt 051.phpt 052.phpt 053.phpt 054.phpt 055.phpt 056.phpt 057.phpt 058.phpt 059.phpt 060.phpt 061.phpt bug29311.phpt bug30967.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29412@lists.php.net to get a copy of this message | ||
georg Sat Dec 4 04:01:34 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mysqli mysqli.c mysqli_prop.c
/php-src/ext/mysqli/tests 001.phpt 002.phpt 003.phpt 004.phpt
005.phpt 006.phpt 007.phpt 008.phpt
009.phpt 010.phpt 011.phpt 012.phpt
013.phpt 014.phpt 015.phpt 016.phpt
017.phpt 018.phpt 019.phpt 020.phpt
021.phpt 022.phpt 023.phpt 024.phpt
025.phpt 026.phpt 027.phpt 028.phpt
029.phpt 030.phpt 031.phpt 032.phpt
033.phpt 034.phpt 035.phpt 036.phpt
037.phpt 038.phpt 039.phpt 040.phpt
041.phpt 042.phpt 043.phpt 044.phpt
045.phpt 046.phpt 047.phpt 048.phpt
049.phpt 050.phpt 051.phpt 052.phpt
053.phpt 054.phpt 055.phpt 056.phpt
057.phpt 058.phpt 059.phpt 060.phpt
061.phpt bug29311.phpt bug30967.phpt
Log:
MFH:
fix for bug #28817 (properties don't work in extended class)
fix for bug #30890 (testsuite)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.43.2.7&r2=1.43.2.8&ty=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.43.2.7 php-src/ext/mysqli/mysqli.c:1.43.2.8 --- php-src/ext/mysqli/mysqli.c:1.43.2.7 Fri Dec 3 02:57:39 2004 +++ php-src/ext/mysqli/mysqli.c Sat Dec 4 04:01:33 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.43.2.7 2004/12/03 07:57:39 georg Exp $ + $Id: mysqli.c,v 1.43.2.8 2004/12/04 09:01:33 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -179,11 +179,6 @@ 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 @@ } 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) { http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.14.2.1&r2=1.14.2.2&ty=u Index: php-src/ext/mysqli/mysqli_prop.c diff -u php-src/ext/mysqli/mysqli_prop.c:1.14.2.1 php-src/ext/mysqli/mysqli_prop.c:1.14.2.2 --- php-src/ext/mysqli/mysqli_prop.c:1.14.2.1 Mon Jul 26 01:45:41 2004 +++ php-src/ext/mysqli/mysqli_prop.c Sat Dec 4 04:01:33 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_prop.c,v 1.14.2.1 2004/07/26 05:45:41 georg Exp $ + $Id: mysqli_prop.c,v 1.14.2.2 2004/12/04 09:01:33 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -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 @@ #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)\ {\ char *c;\ + ALLOC_ZVAL(*retval); \ + CHECK_OBJECT(); \ __get_type;\ - ALLOC_ZVAL(*retval);\ if (!p) {\ ZVAL_NULL(*retval);\ } else {\ @@ -96,19 +107,6 @@ } /* }}} */ -/* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ {"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}, http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/001.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/001.phpt diff -u php-src/ext/mysqli/tests/001.phpt:1.3 php-src/ext/mysqli/tests/001.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/001.phpt:1.3 Mon Aug 11 22:05:21 2003 +++ php-src/ext/mysqli/tests/001.phpt Sat Dec 4 04:01:33 2004 @@ -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 @@ var_dump($test); ?> --EXPECT-- -string(7) "1111111" +string(5) "11111" http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/002.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/002.phpt diff -u php-src/ext/mysqli/tests/002.phpt:1.2 php-src/ext/mysqli/tests/002.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/002.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/002.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/003.phpt?r1=1.2.2.1&r2=1.2.2.2&ty=u Index: php-src/ext/mysqli/tests/003.phpt diff -u php-src/ext/mysqli/tests/003.phpt:1.2.2.1 php-src/ext/mysqli/tests/003.phpt:1.2.2.2 --- php-src/ext/mysqli/tests/003.phpt:1.2.2.1 Mon Nov 1 02:57:46 2004 +++ php-src/ext/mysqli/tests/003.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/004.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/004.phpt diff -u php-src/ext/mysqli/tests/004.phpt:1.2 php-src/ext/mysqli/tests/004.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/004.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/004.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/005.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/005.phpt diff -u php-src/ext/mysqli/tests/005.phpt:1.2 php-src/ext/mysqli/tests/005.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/005.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/005.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/006.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/006.phpt diff -u php-src/ext/mysqli/tests/006.phpt:1.2 php-src/ext/mysqli/tests/006.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/006.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/006.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/007.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/007.phpt diff -u php-src/ext/mysqli/tests/007.phpt:1.2 php-src/ext/mysqli/tests/007.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/007.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/007.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/008.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/008.phpt diff -u php-src/ext/mysqli/tests/008.phpt:1.2 php-src/ext/mysqli/tests/008.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/008.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/008.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/009.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/009.phpt diff -u php-src/ext/mysqli/tests/009.phpt:1.2 php-src/ext/mysqli/tests/009.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/009.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/009.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/010.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/010.phpt diff -u php-src/ext/mysqli/tests/010.phpt:1.3 php-src/ext/mysqli/tests/010.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/010.phpt:1.3 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/010.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/011.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/011.phpt diff -u php-src/ext/mysqli/tests/011.phpt:1.3 php-src/ext/mysqli/tests/011.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/011.phpt:1.3 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/011.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/012.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/012.phpt diff -u php-src/ext/mysqli/tests/012.phpt:1.3 php-src/ext/mysqli/tests/012.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/012.phpt:1.3 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/012.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/013.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/013.phpt diff -u php-src/ext/mysqli/tests/013.phpt:1.2 php-src/ext/mysqli/tests/013.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/013.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/013.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/014.phpt?r1=1.4&r2=1.4.4.1&ty=u Index: php-src/ext/mysqli/tests/014.phpt diff -u php-src/ext/mysqli/tests/014.phpt:1.4 php-src/ext/mysqli/tests/014.phpt:1.4.4.1 --- php-src/ext/mysqli/tests/014.phpt:1.4 Sun Feb 16 10:47:22 2003 +++ php-src/ext/mysqli/tests/014.phpt Sat Dec 4 04:01:33 2004 @@ -3,7 +3,7 @@ --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 @@ 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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/015.phpt?r1=1.2&r2=1.2.4.1&ty=u Index: php-src/ext/mysqli/tests/015.phpt diff -u php-src/ext/mysqli/tests/015.phpt:1.2 php-src/ext/mysqli/tests/015.phpt:1.2.4.1 --- php-src/ext/mysqli/tests/015.phpt:1.2 Sat Feb 15 11:21:35 2003 +++ php-src/ext/mysqli/tests/015.phpt Sat Dec 4 04:01:33 2004 @@ -3,7 +3,7 @@ --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 @@ 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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/016.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/016.phpt diff -u php-src/ext/mysqli/tests/016.phpt:1.2 php-src/ext/mysqli/tests/016.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/016.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/016.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/017.phpt?r1=1.4&r2=1.4.2.1&ty=u Index: php-src/ext/mysqli/tests/017.phpt diff -u php-src/ext/mysqli/tests/017.phpt:1.4 php-src/ext/mysqli/tests/017.phpt:1.4.2.1 --- php-src/ext/mysqli/tests/017.phpt:1.4 Mon Feb 16 10:32:46 2004 +++ php-src/ext/mysqli/tests/017.phpt Sat Dec 4 04:01:33 2004 @@ -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_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 @@ --EXPECT-- array(3) { [0]=> - string(14) "root@localhost" + int(1) [1]=> string(4) "test" [2]=> http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/018.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/018.phpt diff -u php-src/ext/mysqli/tests/018.phpt:1.2 php-src/ext/mysqli/tests/018.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/018.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/018.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/019.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/019.phpt diff -u php-src/ext/mysqli/tests/019.phpt:1.3 php-src/ext/mysqli/tests/019.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/019.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/019.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/020.phpt?r1=1.3.2.1&r2=1.3.2.2&ty=u Index: php-src/ext/mysqli/tests/020.phpt diff -u php-src/ext/mysqli/tests/020.phpt:1.3.2.1 php-src/ext/mysqli/tests/020.phpt:1.3.2.2 --- php-src/ext/mysqli/tests/020.phpt:1.3.2.1 Mon Nov 1 02:57:46 2004 +++ php-src/ext/mysqli/tests/020.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/021.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/021.phpt diff -u php-src/ext/mysqli/tests/021.phpt:1.3 php-src/ext/mysqli/tests/021.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/021.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/021.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/022.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/022.phpt diff -u php-src/ext/mysqli/tests/022.phpt:1.3 php-src/ext/mysqli/tests/022.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/022.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/022.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/023.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/023.phpt diff -u php-src/ext/mysqli/tests/023.phpt:1.3 php-src/ext/mysqli/tests/023.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/023.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/023.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/024.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/024.phpt diff -u php-src/ext/mysqli/tests/024.phpt:1.3 php-src/ext/mysqli/tests/024.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/024.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/024.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/025.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/025.phpt diff -u php-src/ext/mysqli/tests/025.phpt:1.3 php-src/ext/mysqli/tests/025.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/025.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/025.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/026.phpt?r1=1.4&r2=1.4.2.1&ty=u Index: php-src/ext/mysqli/tests/026.phpt diff -u php-src/ext/mysqli/tests/026.phpt:1.4 php-src/ext/mysqli/tests/026.phpt:1.4.2.1 --- php-src/ext/mysqli/tests/026.phpt:1.4 Mon Feb 16 10:32:46 2004 +++ php-src/ext/mysqli/tests/026.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/027.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/027.phpt diff -u php-src/ext/mysqli/tests/027.phpt:1.2 php-src/ext/mysqli/tests/027.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/027.phpt:1.2 Tue Feb 17 02:45:15 2004 +++ php-src/ext/mysqli/tests/027.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/028.phpt?r1=1.2&r2=1.2.4.1&ty=u Index: php-src/ext/mysqli/tests/028.phpt diff -u php-src/ext/mysqli/tests/028.phpt:1.2 php-src/ext/mysqli/tests/028.phpt:1.2.4.1 --- php-src/ext/mysqli/tests/028.phpt:1.2 Wed Apr 2 17:07:27 2003 +++ php-src/ext/mysqli/tests/028.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/029.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/029.phpt diff -u php-src/ext/mysqli/tests/029.phpt:1.1 php-src/ext/mysqli/tests/029.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/029.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/029.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/030.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/030.phpt diff -u php-src/ext/mysqli/tests/030.phpt:1.1 php-src/ext/mysqli/tests/030.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/030.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/030.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/031.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/031.phpt diff -u php-src/ext/mysqli/tests/031.phpt:1.1 php-src/ext/mysqli/tests/031.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/031.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/031.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/032.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/032.phpt diff -u php-src/ext/mysqli/tests/032.phpt:1.1 php-src/ext/mysqli/tests/032.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/032.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/032.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/033.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/033.phpt diff -u php-src/ext/mysqli/tests/033.phpt:1.1 php-src/ext/mysqli/tests/033.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/033.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/033.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/034.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/034.phpt diff -u php-src/ext/mysqli/tests/034.phpt:1.1 php-src/ext/mysqli/tests/034.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/034.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/034.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/035.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/035.phpt diff -u php-src/ext/mysqli/tests/035.phpt:1.2 php-src/ext/mysqli/tests/035.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/035.phpt:1.2 Mon Feb 16 10:32:46 2004 +++ php-src/ext/mysqli/tests/035.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/036.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/036.phpt diff -u php-src/ext/mysqli/tests/036.phpt:1.1 php-src/ext/mysqli/tests/036.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/036.phpt:1.1 Wed Feb 12 05:40:19 2003 +++ php-src/ext/mysqli/tests/036.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/037.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/037.phpt diff -u php-src/ext/mysqli/tests/037.phpt:1.1 php-src/ext/mysqli/tests/037.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/037.phpt:1.1 Wed Feb 12 05:40:19 2003 +++ php-src/ext/mysqli/tests/037.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/038.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/038.phpt diff -u php-src/ext/mysqli/tests/038.phpt:1.1 php-src/ext/mysqli/tests/038.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/038.phpt:1.1 Wed Feb 12 05:40:19 2003 +++ php-src/ext/mysqli/tests/038.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/039.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/039.phpt diff -u php-src/ext/mysqli/tests/039.phpt:1.1 php-src/ext/mysqli/tests/039.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/039.phpt:1.1 Wed Feb 12 05:40:19 2003 +++ php-src/ext/mysqli/tests/039.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/040.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/040.phpt diff -u php-src/ext/mysqli/tests/040.phpt:1.1 php-src/ext/mysqli/tests/040.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/040.phpt:1.1 Wed Feb 12 05:40:19 2003 +++ php-src/ext/mysqli/tests/040.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/041.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/041.phpt diff -u php-src/ext/mysqli/tests/041.phpt:1.1 php-src/ext/mysqli/tests/041.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/041.phpt:1.1 Wed Feb 12 05:40:19 2003 +++ php-src/ext/mysqli/tests/041.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/042.phpt?r1=1.5&r2=1.5.2.1&ty=u Index: php-src/ext/mysqli/tests/042.phpt diff -u php-src/ext/mysqli/tests/042.phpt:1.5 php-src/ext/mysqli/tests/042.phpt:1.5.2.1 --- php-src/ext/mysqli/tests/042.phpt:1.5 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/042.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/043.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/043.phpt diff -u php-src/ext/mysqli/tests/043.phpt:1.3 php-src/ext/mysqli/tests/043.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/043.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/043.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/044.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/044.phpt diff -u php-src/ext/mysqli/tests/044.phpt:1.1 php-src/ext/mysqli/tests/044.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/044.phpt:1.1 Wed Feb 12 20:23:28 2003 +++ php-src/ext/mysqli/tests/044.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/045.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/045.phpt diff -u php-src/ext/mysqli/tests/045.phpt:1.3 php-src/ext/mysqli/tests/045.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/045.phpt:1.3 Mon Feb 16 10:32:46 2004 +++ php-src/ext/mysqli/tests/045.phpt Sat Dec 4 04:01:33 2004 @@ -3,7 +3,7 @@ --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 @@ $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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/046.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/046.phpt diff -u php-src/ext/mysqli/tests/046.phpt:1.3 php-src/ext/mysqli/tests/046.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/046.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/046.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/047.phpt?r1=1.4&r2=1.4.2.1&ty=u Index: php-src/ext/mysqli/tests/047.phpt diff -u php-src/ext/mysqli/tests/047.phpt:1.4 php-src/ext/mysqli/tests/047.phpt:1.4.2.1 --- php-src/ext/mysqli/tests/047.phpt:1.4 Thu Sep 25 07:19:58 2003 +++ php-src/ext/mysqli/tests/047.phpt Sat Dec 4 04:01:34 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/048.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/048.phpt diff -u php-src/ext/mysqli/tests/048.phpt:1.2 php-src/ext/mysqli/tests/048.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/048.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/048.phpt Sat Dec 4 04:01:34 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/049.phpt?r1=1.1&r2=1.1.2.1&ty=u Index: php-src/ext/mysqli/tests/049.phpt diff -u php-src/ext/mysqli/tests/049.phpt:1.1 php-src/ext/mysqli/tests/049.phpt:1.1.2.1 --- php-src/ext/mysqli/tests/049.phpt:1.1 Mon Feb 17 11:19:49 2003 +++ php-src/ext/mysqli/tests/049.phpt Sat Dec 4 04:01:34 2004 @@ -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) http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/050.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/050.phpt diff -u php-src/ext/mysqli/tests/050.phpt:1.1 php-src/ext/mysqli/tests/050.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/050.phpt:1.1 Mon Feb 17 18:29:58 2003 +++ php-src/ext/mysqli/tests/050.phpt Sat Dec 4 04:01:34 2004 @@ -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 stamement ************************/ - $link = mysqli_connect("localhost", $user, $passwd); + $link = mysqli_connect($host, $user, $passwd); $stmt = mysqli_prepare($link, "SELECT CURRENT_USER()"); mysqli_execute($stmt); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/051.phpt?r1=1.2&r2=1.2.4.1&ty=u Index: php-src/ext/mysqli/tests/051.phpt diff -u php-src/ext/mysqli/tests/051.phpt:1.2 php-src/ext/mysqli/tests/051.phpt:1.2.4.1 --- php-src/ext/mysqli/tests/051.phpt:1.2 Mon Mar 3 17:50:34 2003 +++ php-src/ext/mysqli/tests/051.phpt Sat Dec 4 04:01:34 2004 @@ -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 ************************/ - $link = mysqli_connect("localhost", $user, $passwd); + $link = mysqli_connect($host, $user, $passwd); $stmt1 = mysqli_prepare($link, "SELECT CURRENT_USER()"); mysqli_execute($stmt1); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/052.phpt?r1=1.2&r2=1.2.4.1&ty=u Index: php-src/ext/mysqli/tests/052.phpt diff -u php-src/ext/mysqli/tests/052.phpt:1.2 php-src/ext/mysqli/tests/052.phpt:1.2.4.1 --- php-src/ext/mysqli/tests/052.phpt:1.2 Mon Mar 3 17:50:34 2003 +++ php-src/ext/mysqli/tests/052.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- call statement after close +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -7,7 +9,7 @@ /************************ * statement call after close ************************/ - $link = mysqli_connect("localhost", $user, $passwd); + $link = mysqli_connect($host, $user, $passwd); $stmt2 = mysqli_prepare($link, "SELECT CURRENT_USER()"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/053.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/053.phpt diff -u php-src/ext/mysqli/tests/053.phpt:1.1 php-src/ext/mysqli/tests/053.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/053.phpt:1.1 Mon Feb 17 18:29:58 2003 +++ php-src/ext/mysqli/tests/053.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- not freed resultset +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -7,7 +9,7 @@ /************************ * 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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/054.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/054.phpt diff -u php-src/ext/mysqli/tests/054.phpt:1.1 php-src/ext/mysqli/tests/054.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/054.phpt:1.1 Mon Feb 17 18:29:58 2003 +++ php-src/ext/mysqli/tests/054.phpt Sat Dec 4 04:01:34 2004 @@ -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 ************************/ - $link = mysqli_connect("localhost", $user, $passwd); + $link = mysqli_connect($host, $user, $passwd); $result1 = mysqli_query($link, "SELECT CURRENT_USER()"); mysqli_close($link); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/055.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/055.phpt diff -u php-src/ext/mysqli/tests/055.phpt:1.1 php-src/ext/mysqli/tests/055.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/055.phpt:1.1 Mon Feb 17 18:29:58 2003 +++ php-src/ext/mysqli/tests/055.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- free nothing +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -7,7 +9,7 @@ /************************ * 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()"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/056.phpt?r1=1.1&r2=1.1.2.1&ty=u Index: php-src/ext/mysqli/tests/056.phpt diff -u php-src/ext/mysqli/tests/056.phpt:1.1 php-src/ext/mysqli/tests/056.phpt:1.1.2.1 --- php-src/ext/mysqli/tests/056.phpt:1.1 Mon Feb 17 19:42:38 2003 +++ php-src/ext/mysqli/tests/056.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- extend mysqli +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -11,7 +13,7 @@ } $foo = new foobar(); - $foo->connect("localhost", $user, $passwd); + $foo->connect($host, $user, $passwd); $foo->close(); printf("%s\n", $foo->test()); ?> http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/057.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/057.phpt diff -u php-src/ext/mysqli/tests/057.phpt:1.2 php-src/ext/mysqli/tests/057.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/057.phpt:1.2 Thu Sep 25 07:19:58 2003 +++ php-src/ext/mysqli/tests/057.phpt Sat Dec 4 04:01:34 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/058.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/058.phpt diff -u php-src/ext/mysqli/tests/058.phpt:1.2 php-src/ext/mysqli/tests/058.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/058.phpt:1.2 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/058.phpt Sat Dec 4 04:01:34 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/059.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/059.phpt diff -u php-src/ext/mysqli/tests/059.phpt:1.2 php-src/ext/mysqli/tests/059.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/059.phpt:1.2 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/059.phpt Sat Dec 4 04:01:34 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/060.phpt?r1=1.1&r2=1.1.2.1&ty=u Index: php-src/ext/mysqli/tests/060.phpt diff -u php-src/ext/mysqli/tests/060.phpt:1.1 php-src/ext/mysqli/tests/060.phpt:1.1.2.1 --- php-src/ext/mysqli/tests/060.phpt:1.1 Sat Sep 6 15:40:53 2003 +++ php-src/ext/mysqli/tests/060.phpt Sat Dec 4 04:01:34 2004 @@ -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 @@ } /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); + $link = mysqli_connect($host, $user, $passwd); mysqli_select_db($link, "test"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/061.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u Index: php-src/ext/mysqli/tests/061.phpt diff -u php-src/ext/mysqli/tests/061.phpt:1.1.2.1 php-src/ext/mysqli/tests/061.phpt:1.1.2.2 --- php-src/ext/mysqli/tests/061.phpt:1.1.2.1 Sat Sep 4 10:19:20 2004 +++ php-src/ext/mysqli/tests/061.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- local infile handler +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -10,7 +12,7 @@ } /*** 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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/bug29311.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u Index: php-src/ext/mysqli/tests/bug29311.phpt diff -u php-src/ext/mysqli/tests/bug29311.phpt:1.1.2.1 php-src/ext/mysqli/tests/bug29311.phpt:1.1.2.2 --- php-src/ext/mysqli/tests/bug29311.phpt:1.1.2.1 Fri Jul 23 08:48:20 2004 +++ php-src/ext/mysqli/tests/bug29311.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- constructor test +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -7,7 +9,8 @@ /* 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 @@ 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 @@ $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++) { http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/bug30967.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u Index: php-src/ext/mysqli/tests/bug30967.phpt diff -u php-src/ext/mysqli/tests/bug30967.phpt:1.1.2.1 php-src/ext/mysqli/tests/bug30967.phpt:1.1.2.2 --- php-src/ext/mysqli/tests/bug30967.phpt:1.1.2.1 Fri Dec 3 02:57:39 2004 +++ php-src/ext/mysqli/tests/bug30967.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- Bug #30967 testcase (properties) +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -10,7 +12,7 @@ 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);
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.43.2.7&r2=1.43.2.8&ty=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.43.2.7 php-src/ext/mysqli/mysqli.c:1.43.2.8 --- php-src/ext/mysqli/mysqli.c:1.43.2.7 Fri Dec 3 02:57:39 2004 +++ php-src/ext/mysqli/mysqli.c Sat Dec 4 04:01:33 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.43.2.7 2004/12/03 07:57:39 georg Exp $ + $Id: mysqli.c,v 1.43.2.8 2004/12/04 09:01:33 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -179,11 +179,6 @@ 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 @@ } 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) { http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.14.2.1&r2=1.14.2.2&ty=u Index: php-src/ext/mysqli/mysqli_prop.c diff -u php-src/ext/mysqli/mysqli_prop.c:1.14.2.1 php-src/ext/mysqli/mysqli_prop.c:1.14.2.2 --- php-src/ext/mysqli/mysqli_prop.c:1.14.2.1 Mon Jul 26 01:45:41 2004 +++ php-src/ext/mysqli/mysqli_prop.c Sat Dec 4 04:01:33 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_prop.c,v 1.14.2.1 2004/07/26 05:45:41 georg Exp $ + $Id: mysqli_prop.c,v 1.14.2.2 2004/12/04 09:01:33 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -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 @@ #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)\ {\ char *c;\ + ALLOC_ZVAL(*retval); \ + CHECK_OBJECT(); \ __get_type;\ - ALLOC_ZVAL(*retval);\ if (!p) {\ ZVAL_NULL(*retval);\ } else {\ @@ -96,19 +107,6 @@ } /* }}} */ -/* {{{ 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 @@ /* {{{ 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 @@ /* {{{ 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 @@ {"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}, http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/001.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/001.phpt diff -u php-src/ext/mysqli/tests/001.phpt:1.3 php-src/ext/mysqli/tests/001.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/001.phpt:1.3 Mon Aug 11 22:05:21 2003 +++ php-src/ext/mysqli/tests/001.phpt Sat Dec 4 04:01:33 2004 @@ -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 @@ var_dump($test); ?> --EXPECT-- -string(7) "1111111" +string(5) "11111" http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/002.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/002.phpt diff -u php-src/ext/mysqli/tests/002.phpt:1.2 php-src/ext/mysqli/tests/002.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/002.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/002.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/003.phpt?r1=1.2.2.1&r2=1.2.2.2&ty=u Index: php-src/ext/mysqli/tests/003.phpt diff -u php-src/ext/mysqli/tests/003.phpt:1.2.2.1 php-src/ext/mysqli/tests/003.phpt:1.2.2.2 --- php-src/ext/mysqli/tests/003.phpt:1.2.2.1 Mon Nov 1 02:57:46 2004 +++ php-src/ext/mysqli/tests/003.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/004.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/004.phpt diff -u php-src/ext/mysqli/tests/004.phpt:1.2 php-src/ext/mysqli/tests/004.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/004.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/004.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/005.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/005.phpt diff -u php-src/ext/mysqli/tests/005.phpt:1.2 php-src/ext/mysqli/tests/005.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/005.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/005.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/006.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/006.phpt diff -u php-src/ext/mysqli/tests/006.phpt:1.2 php-src/ext/mysqli/tests/006.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/006.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/006.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/007.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/007.phpt diff -u php-src/ext/mysqli/tests/007.phpt:1.2 php-src/ext/mysqli/tests/007.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/007.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/007.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/008.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/008.phpt diff -u php-src/ext/mysqli/tests/008.phpt:1.2 php-src/ext/mysqli/tests/008.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/008.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/008.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/009.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/009.phpt diff -u php-src/ext/mysqli/tests/009.phpt:1.2 php-src/ext/mysqli/tests/009.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/009.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/009.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/010.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/010.phpt diff -u php-src/ext/mysqli/tests/010.phpt:1.3 php-src/ext/mysqli/tests/010.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/010.phpt:1.3 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/010.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/011.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/011.phpt diff -u php-src/ext/mysqli/tests/011.phpt:1.3 php-src/ext/mysqli/tests/011.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/011.phpt:1.3 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/011.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/012.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/012.phpt diff -u php-src/ext/mysqli/tests/012.phpt:1.3 php-src/ext/mysqli/tests/012.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/012.phpt:1.3 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/012.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/013.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/013.phpt diff -u php-src/ext/mysqli/tests/013.phpt:1.2 php-src/ext/mysqli/tests/013.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/013.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/013.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/014.phpt?r1=1.4&r2=1.4.4.1&ty=u Index: php-src/ext/mysqli/tests/014.phpt diff -u php-src/ext/mysqli/tests/014.phpt:1.4 php-src/ext/mysqli/tests/014.phpt:1.4.4.1 --- php-src/ext/mysqli/tests/014.phpt:1.4 Sun Feb 16 10:47:22 2003 +++ php-src/ext/mysqli/tests/014.phpt Sat Dec 4 04:01:33 2004 @@ -3,7 +3,7 @@ --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 @@ 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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/015.phpt?r1=1.2&r2=1.2.4.1&ty=u Index: php-src/ext/mysqli/tests/015.phpt diff -u php-src/ext/mysqli/tests/015.phpt:1.2 php-src/ext/mysqli/tests/015.phpt:1.2.4.1 --- php-src/ext/mysqli/tests/015.phpt:1.2 Sat Feb 15 11:21:35 2003 +++ php-src/ext/mysqli/tests/015.phpt Sat Dec 4 04:01:33 2004 @@ -3,7 +3,7 @@ --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 @@ 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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/016.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/016.phpt diff -u php-src/ext/mysqli/tests/016.phpt:1.2 php-src/ext/mysqli/tests/016.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/016.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/016.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/017.phpt?r1=1.4&r2=1.4.2.1&ty=u Index: php-src/ext/mysqli/tests/017.phpt diff -u php-src/ext/mysqli/tests/017.phpt:1.4 php-src/ext/mysqli/tests/017.phpt:1.4.2.1 --- php-src/ext/mysqli/tests/017.phpt:1.4 Mon Feb 16 10:32:46 2004 +++ php-src/ext/mysqli/tests/017.phpt Sat Dec 4 04:01:33 2004 @@ -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_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 @@ --EXPECT-- array(3) { [0]=> - string(14) "root@localhost" + int(1) [1]=> string(4) "test" [2]=> http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/018.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/018.phpt diff -u php-src/ext/mysqli/tests/018.phpt:1.2 php-src/ext/mysqli/tests/018.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/018.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/018.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/019.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/019.phpt diff -u php-src/ext/mysqli/tests/019.phpt:1.3 php-src/ext/mysqli/tests/019.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/019.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/019.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/020.phpt?r1=1.3.2.1&r2=1.3.2.2&ty=u Index: php-src/ext/mysqli/tests/020.phpt diff -u php-src/ext/mysqli/tests/020.phpt:1.3.2.1 php-src/ext/mysqli/tests/020.phpt:1.3.2.2 --- php-src/ext/mysqli/tests/020.phpt:1.3.2.1 Mon Nov 1 02:57:46 2004 +++ php-src/ext/mysqli/tests/020.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/021.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/021.phpt diff -u php-src/ext/mysqli/tests/021.phpt:1.3 php-src/ext/mysqli/tests/021.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/021.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/021.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/022.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/022.phpt diff -u php-src/ext/mysqli/tests/022.phpt:1.3 php-src/ext/mysqli/tests/022.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/022.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/022.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/023.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/023.phpt diff -u php-src/ext/mysqli/tests/023.phpt:1.3 php-src/ext/mysqli/tests/023.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/023.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/023.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/024.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/024.phpt diff -u php-src/ext/mysqli/tests/024.phpt:1.3 php-src/ext/mysqli/tests/024.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/024.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/024.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/025.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/025.phpt diff -u php-src/ext/mysqli/tests/025.phpt:1.3 php-src/ext/mysqli/tests/025.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/025.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/025.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/026.phpt?r1=1.4&r2=1.4.2.1&ty=u Index: php-src/ext/mysqli/tests/026.phpt diff -u php-src/ext/mysqli/tests/026.phpt:1.4 php-src/ext/mysqli/tests/026.phpt:1.4.2.1 --- php-src/ext/mysqli/tests/026.phpt:1.4 Mon Feb 16 10:32:46 2004 +++ php-src/ext/mysqli/tests/026.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/027.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/027.phpt diff -u php-src/ext/mysqli/tests/027.phpt:1.2 php-src/ext/mysqli/tests/027.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/027.phpt:1.2 Tue Feb 17 02:45:15 2004 +++ php-src/ext/mysqli/tests/027.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/028.phpt?r1=1.2&r2=1.2.4.1&ty=u Index: php-src/ext/mysqli/tests/028.phpt diff -u php-src/ext/mysqli/tests/028.phpt:1.2 php-src/ext/mysqli/tests/028.phpt:1.2.4.1 --- php-src/ext/mysqli/tests/028.phpt:1.2 Wed Apr 2 17:07:27 2003 +++ php-src/ext/mysqli/tests/028.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/029.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/029.phpt diff -u php-src/ext/mysqli/tests/029.phpt:1.1 php-src/ext/mysqli/tests/029.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/029.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/029.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/030.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/030.phpt diff -u php-src/ext/mysqli/tests/030.phpt:1.1 php-src/ext/mysqli/tests/030.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/030.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/030.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/031.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/031.phpt diff -u php-src/ext/mysqli/tests/031.phpt:1.1 php-src/ext/mysqli/tests/031.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/031.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/031.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/032.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/032.phpt diff -u php-src/ext/mysqli/tests/032.phpt:1.1 php-src/ext/mysqli/tests/032.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/032.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/032.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/033.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/033.phpt diff -u php-src/ext/mysqli/tests/033.phpt:1.1 php-src/ext/mysqli/tests/033.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/033.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/033.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/034.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/034.phpt diff -u php-src/ext/mysqli/tests/034.phpt:1.1 php-src/ext/mysqli/tests/034.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/034.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/034.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/035.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/035.phpt diff -u php-src/ext/mysqli/tests/035.phpt:1.2 php-src/ext/mysqli/tests/035.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/035.phpt:1.2 Mon Feb 16 10:32:46 2004 +++ php-src/ext/mysqli/tests/035.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/036.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/036.phpt diff -u php-src/ext/mysqli/tests/036.phpt:1.1 php-src/ext/mysqli/tests/036.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/036.phpt:1.1 Wed Feb 12 05:40:19 2003 +++ php-src/ext/mysqli/tests/036.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/037.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/037.phpt diff -u php-src/ext/mysqli/tests/037.phpt:1.1 php-src/ext/mysqli/tests/037.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/037.phpt:1.1 Wed Feb 12 05:40:19 2003 +++ php-src/ext/mysqli/tests/037.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/038.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/038.phpt diff -u php-src/ext/mysqli/tests/038.phpt:1.1 php-src/ext/mysqli/tests/038.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/038.phpt:1.1 Wed Feb 12 05:40:19 2003 +++ php-src/ext/mysqli/tests/038.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/039.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/039.phpt diff -u php-src/ext/mysqli/tests/039.phpt:1.1 php-src/ext/mysqli/tests/039.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/039.phpt:1.1 Wed Feb 12 05:40:19 2003 +++ php-src/ext/mysqli/tests/039.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/040.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/040.phpt diff -u php-src/ext/mysqli/tests/040.phpt:1.1 php-src/ext/mysqli/tests/040.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/040.phpt:1.1 Wed Feb 12 05:40:19 2003 +++ php-src/ext/mysqli/tests/040.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/041.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/041.phpt diff -u php-src/ext/mysqli/tests/041.phpt:1.1 php-src/ext/mysqli/tests/041.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/041.phpt:1.1 Wed Feb 12 05:40:19 2003 +++ php-src/ext/mysqli/tests/041.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/042.phpt?r1=1.5&r2=1.5.2.1&ty=u Index: php-src/ext/mysqli/tests/042.phpt diff -u php-src/ext/mysqli/tests/042.phpt:1.5 php-src/ext/mysqli/tests/042.phpt:1.5.2.1 --- php-src/ext/mysqli/tests/042.phpt:1.5 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/042.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/043.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/043.phpt diff -u php-src/ext/mysqli/tests/043.phpt:1.3 php-src/ext/mysqli/tests/043.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/043.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/043.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/044.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/044.phpt diff -u php-src/ext/mysqli/tests/044.phpt:1.1 php-src/ext/mysqli/tests/044.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/044.phpt:1.1 Wed Feb 12 20:23:28 2003 +++ php-src/ext/mysqli/tests/044.phpt Sat Dec 4 04:01:33 2004 @@ -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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/045.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/045.phpt diff -u php-src/ext/mysqli/tests/045.phpt:1.3 php-src/ext/mysqli/tests/045.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/045.phpt:1.3 Mon Feb 16 10:32:46 2004 +++ php-src/ext/mysqli/tests/045.phpt Sat Dec 4 04:01:33 2004 @@ -3,7 +3,7 @@ --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 @@ $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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/046.phpt?r1=1.3&r2=1.3.2.1&ty=u Index: php-src/ext/mysqli/tests/046.phpt diff -u php-src/ext/mysqli/tests/046.phpt:1.3 php-src/ext/mysqli/tests/046.phpt:1.3.2.1 --- php-src/ext/mysqli/tests/046.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/046.phpt Sat Dec 4 04:01:33 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/047.phpt?r1=1.4&r2=1.4.2.1&ty=u Index: php-src/ext/mysqli/tests/047.phpt diff -u php-src/ext/mysqli/tests/047.phpt:1.4 php-src/ext/mysqli/tests/047.phpt:1.4.2.1 --- php-src/ext/mysqli/tests/047.phpt:1.4 Thu Sep 25 07:19:58 2003 +++ php-src/ext/mysqli/tests/047.phpt Sat Dec 4 04:01:34 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/048.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/048.phpt diff -u php-src/ext/mysqli/tests/048.phpt:1.2 php-src/ext/mysqli/tests/048.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/048.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/048.phpt Sat Dec 4 04:01:34 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/049.phpt?r1=1.1&r2=1.1.2.1&ty=u Index: php-src/ext/mysqli/tests/049.phpt diff -u php-src/ext/mysqli/tests/049.phpt:1.1 php-src/ext/mysqli/tests/049.phpt:1.1.2.1 --- php-src/ext/mysqli/tests/049.phpt:1.1 Mon Feb 17 11:19:49 2003 +++ php-src/ext/mysqli/tests/049.phpt Sat Dec 4 04:01:34 2004 @@ -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) http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/050.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/050.phpt diff -u php-src/ext/mysqli/tests/050.phpt:1.1 php-src/ext/mysqli/tests/050.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/050.phpt:1.1 Mon Feb 17 18:29:58 2003 +++ php-src/ext/mysqli/tests/050.phpt Sat Dec 4 04:01:34 2004 @@ -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 stamement ************************/ - $link = mysqli_connect("localhost", $user, $passwd); + $link = mysqli_connect($host, $user, $passwd); $stmt = mysqli_prepare($link, "SELECT CURRENT_USER()"); mysqli_execute($stmt); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/051.phpt?r1=1.2&r2=1.2.4.1&ty=u Index: php-src/ext/mysqli/tests/051.phpt diff -u php-src/ext/mysqli/tests/051.phpt:1.2 php-src/ext/mysqli/tests/051.phpt:1.2.4.1 --- php-src/ext/mysqli/tests/051.phpt:1.2 Mon Mar 3 17:50:34 2003 +++ php-src/ext/mysqli/tests/051.phpt Sat Dec 4 04:01:34 2004 @@ -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 ************************/ - $link = mysqli_connect("localhost", $user, $passwd); + $link = mysqli_connect($host, $user, $passwd); $stmt1 = mysqli_prepare($link, "SELECT CURRENT_USER()"); mysqli_execute($stmt1); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/052.phpt?r1=1.2&r2=1.2.4.1&ty=u Index: php-src/ext/mysqli/tests/052.phpt diff -u php-src/ext/mysqli/tests/052.phpt:1.2 php-src/ext/mysqli/tests/052.phpt:1.2.4.1 --- php-src/ext/mysqli/tests/052.phpt:1.2 Mon Mar 3 17:50:34 2003 +++ php-src/ext/mysqli/tests/052.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- call statement after close +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -7,7 +9,7 @@ /************************ * statement call after close ************************/ - $link = mysqli_connect("localhost", $user, $passwd); + $link = mysqli_connect($host, $user, $passwd); $stmt2 = mysqli_prepare($link, "SELECT CURRENT_USER()"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/053.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/053.phpt diff -u php-src/ext/mysqli/tests/053.phpt:1.1 php-src/ext/mysqli/tests/053.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/053.phpt:1.1 Mon Feb 17 18:29:58 2003 +++ php-src/ext/mysqli/tests/053.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- not freed resultset +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -7,7 +9,7 @@ /************************ * 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); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/054.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/054.phpt diff -u php-src/ext/mysqli/tests/054.phpt:1.1 php-src/ext/mysqli/tests/054.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/054.phpt:1.1 Mon Feb 17 18:29:58 2003 +++ php-src/ext/mysqli/tests/054.phpt Sat Dec 4 04:01:34 2004 @@ -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 ************************/ - $link = mysqli_connect("localhost", $user, $passwd); + $link = mysqli_connect($host, $user, $passwd); $result1 = mysqli_query($link, "SELECT CURRENT_USER()"); mysqli_close($link); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/055.phpt?r1=1.1&r2=1.1.4.1&ty=u Index: php-src/ext/mysqli/tests/055.phpt diff -u php-src/ext/mysqli/tests/055.phpt:1.1 php-src/ext/mysqli/tests/055.phpt:1.1.4.1 --- php-src/ext/mysqli/tests/055.phpt:1.1 Mon Feb 17 18:29:58 2003 +++ php-src/ext/mysqli/tests/055.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- free nothing +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -7,7 +9,7 @@ /************************ * 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()"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/056.phpt?r1=1.1&r2=1.1.2.1&ty=u Index: php-src/ext/mysqli/tests/056.phpt diff -u php-src/ext/mysqli/tests/056.phpt:1.1 php-src/ext/mysqli/tests/056.phpt:1.1.2.1 --- php-src/ext/mysqli/tests/056.phpt:1.1 Mon Feb 17 19:42:38 2003 +++ php-src/ext/mysqli/tests/056.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- extend mysqli +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -11,7 +13,7 @@ } $foo = new foobar(); - $foo->connect("localhost", $user, $passwd); + $foo->connect($host, $user, $passwd); $foo->close(); printf("%s\n", $foo->test()); ?> http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/057.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/057.phpt diff -u php-src/ext/mysqli/tests/057.phpt:1.2 php-src/ext/mysqli/tests/057.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/057.phpt:1.2 Thu Sep 25 07:19:58 2003 +++ php-src/ext/mysqli/tests/057.phpt Sat Dec 4 04:01:34 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/058.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/058.phpt diff -u php-src/ext/mysqli/tests/058.phpt:1.2 php-src/ext/mysqli/tests/058.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/058.phpt:1.2 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/058.phpt Sat Dec 4 04:01:34 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/059.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/mysqli/tests/059.phpt diff -u php-src/ext/mysqli/tests/059.phpt:1.2 php-src/ext/mysqli/tests/059.phpt:1.2.2.1 --- php-src/ext/mysqli/tests/059.phpt:1.2 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/059.phpt Sat Dec 4 04:01:34 2004 @@ -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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/060.phpt?r1=1.1&r2=1.1.2.1&ty=u Index: php-src/ext/mysqli/tests/060.phpt diff -u php-src/ext/mysqli/tests/060.phpt:1.1 php-src/ext/mysqli/tests/060.phpt:1.1.2.1 --- php-src/ext/mysqli/tests/060.phpt:1.1 Sat Sep 6 15:40:53 2003 +++ php-src/ext/mysqli/tests/060.phpt Sat Dec 4 04:01:34 2004 @@ -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 @@ } /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect("localhost", $user, $passwd); + $link = mysqli_connect($host, $user, $passwd); mysqli_select_db($link, "test"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/061.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u Index: php-src/ext/mysqli/tests/061.phpt diff -u php-src/ext/mysqli/tests/061.phpt:1.1.2.1 php-src/ext/mysqli/tests/061.phpt:1.1.2.2 --- php-src/ext/mysqli/tests/061.phpt:1.1.2.1 Sat Sep 4 10:19:20 2004 +++ php-src/ext/mysqli/tests/061.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- local infile handler +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -10,7 +12,7 @@ } /*** 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"); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/bug29311.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u Index: php-src/ext/mysqli/tests/bug29311.phpt diff -u php-src/ext/mysqli/tests/bug29311.phpt:1.1.2.1 php-src/ext/mysqli/tests/bug29311.phpt:1.1.2.2 --- php-src/ext/mysqli/tests/bug29311.phpt:1.1.2.1 Fri Jul 23 08:48:20 2004 +++ php-src/ext/mysqli/tests/bug29311.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- constructor test +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -7,7 +9,8 @@ /* 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 @@ 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 @@ $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++) { http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/bug30967.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u Index: php-src/ext/mysqli/tests/bug30967.phpt diff -u php-src/ext/mysqli/tests/bug30967.phpt:1.1.2.1 php-src/ext/mysqli/tests/bug30967.phpt:1.1.2.2 --- php-src/ext/mysqli/tests/bug30967.phpt:1.1.2.1 Fri Dec 3 02:57:39 2004 +++ php-src/ext/mysqli/tests/bug30967.phpt Sat Dec 4 04:01:34 2004 @@ -1,5 +1,7 @@ --TEST-- Bug #30967 testcase (properties) +--SKIPIF-- +<?php require_once('skipif.inc'); ?> --FILE-- <?php include "connect.inc"; @@ -10,7 +12,7 @@ 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);