uw Thu Aug 9 09:43:28 2007 UTC
Modified files:
/php-src/ext/mysqli/tests bug37090.phpt bug28817.phpt bug29311.phpt
bug30967.phpt bug31668.phpt bug32405.phpt
bug33090.phpt bug33263.phpt bug33491.phpt
bug34785.phpt bug34810.phpt bug35103.phpt
bug35517.phpt bug35759.phpt bug36420.phpt
bug36745.phpt bug36949.phpt bug38710.phpt
Log:
Next set of files which now feature the new environment variable
MYSQL_TEST_SKIP_CONNECT_FAILURE which controls how connection problems
are handled: failure (MYSQL_TEST_SKIP_CONNECT_FAILURE = false, default)
or skip (MYSQL_TEST_SKIP_CONNECT_FAILURE = true)
Also, some minor tweaking of connection parameters in the tests.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug37090.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysqli/tests/bug37090.phpt
diff -u /dev/null php-src/ext/mysqli/tests/bug37090.phpt:1.2
--- /dev/null Thu Aug 9 09:43:28 2007
+++ php-src/ext/mysqli/tests/bug37090.phpt Thu Aug 9 09:43:28 2007
@@ -0,0 +1,48 @@
+--TEST--
+Bug #37090 (mysqli_set_charset return code)
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+if (!function_exists('mysqli_set_charset')) {
+ die('skip mysqli_set_charset() not available');
+}
+if (ini_get('unicode.semantics')) {
+ die("skip Functionality not available in unicode mode");
+}
+?>
+--FILE--
+<?php
+ include "connect.inc";
+
+ $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
+
+ $cs = array();
+ $cs[] = $mysql->set_charset("latin5");
+ $cs[] = $mysql->character_set_name();
+
+ $cs[] = $mysql->set_charset("utf8");
+ $cs[] = $mysql->character_set_name();
+
+ $cs[] = $mysql->set_charset("notdefined");
+ $cs[] = $mysql->character_set_name();
+
+ var_dump($cs);
+ print "done!";
+?>
+--EXPECT--
+array(6) {
+ [0]=>
+ bool(true)
+ [1]=>
+ string(6) "latin5"
+ [2]=>
+ bool(true)
+ [3]=>
+ string(4) "utf8"
+ [4]=>
+ bool(false)
+ [5]=>
+ string(4) "utf8"
+}
+done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug28817.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/bug28817.phpt
diff -u php-src/ext/mysqli/tests/bug28817.phpt:1.4
php-src/ext/mysqli/tests/bug28817.phpt:1.5
--- php-src/ext/mysqli/tests/bug28817.phpt:1.4 Mon May 7 17:23:04 2007
+++ php-src/ext/mysqli/tests/bug28817.phpt Thu Aug 9 09:43:28 2007
@@ -1,7 +1,10 @@
--TEST--
Bug #28817 (problems with properties declared in the class extending MySQLi)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
@@ -21,12 +24,12 @@
var_dump($mysql->p_test);
@var_dump($mysql->errno);
- $mysql->connect($host, $user, $passwd);
+ $mysql->connect($host, $user, $passwd, $db, $port, $socket);
$mysql->select_db("nonexistingdb");
var_dump($mysql->errno > 0);
- $mysql->close();
+ $mysql->close();
?>
--EXPECTF--
array(2) {
@@ -36,4 +39,4 @@
%s(3) "bar"
}
NULL
-bool(true)
+bool(true)
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug29311.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/bug29311.phpt
diff -u php-src/ext/mysqli/tests/bug29311.phpt:1.3
php-src/ext/mysqli/tests/bug29311.phpt:1.4
--- php-src/ext/mysqli/tests/bug29311.phpt:1.3 Sat Dec 4 08:50:33 2004
+++ php-src/ext/mysqli/tests/bug29311.phpt Thu Aug 9 09:43:28 2007
@@ -1,7 +1,10 @@
--TEST--
constructor test
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
@@ -9,8 +12,8 @@
/* class 1 calls parent constructor */
class mysql1 extends mysqli {
function __construct() {
- global $host, $user, $passwd;
- parent::__construct($host, $user, $passwd, "test");
+ global $host, $user, $passwd, $db, $port, $socket;
+ parent::__construct($host, $user, $passwd, $db, $port,
$socket);
}
}
@@ -18,8 +21,8 @@
class mysql2 extends mysqli {
function __construct() {
- global $host, $user, $passwd;
- $this->connect($host, $user, $passwd, "test");
+ global $host, $user, $passwd, $db, $port, $socket;
+ $this->connect($host, $user, $passwd, $db, $port,
$socket);
}
}
@@ -30,7 +33,7 @@
$foo[0] = new mysql1();
$foo[1] = new mysql2();
- $foo[2] = new mysql3($host, $user, $passwd, "test");
+ $foo[2] = new mysql3($host, $user, $passwd, $db, $port, $socket);
for ($i=0; $i < 3; $i++) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug30967.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/bug30967.phpt
diff -u php-src/ext/mysqli/tests/bug30967.phpt:1.5
php-src/ext/mysqli/tests/bug30967.phpt:1.6
--- php-src/ext/mysqli/tests/bug30967.phpt:1.5 Mon May 7 17:23:04 2007
+++ php-src/ext/mysqli/tests/bug30967.phpt Thu Aug 9 09:43:28 2007
@@ -1,7 +1,10 @@
--TEST--
Bug #30967 (problems with properties declared in the class extending the class
extending MySQLi)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
@@ -12,12 +15,12 @@
class mysql2 extends mysql1 {
}
- $mysql = new mysql2($host, $user, $passwd, "test");
+ $mysql = new mysql2($host, $user, $passwd, $db, $port, $socket);
$mysql->query("THIS DOES NOT WORK");
printf("%d\n", $mysql->errno);
- $mysql->close();
+ $mysql->close();
?>
--EXPECTF--
1064
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug31668.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/bug31668.phpt
diff -u php-src/ext/mysqli/tests/bug31668.phpt:1.4
php-src/ext/mysqli/tests/bug31668.phpt:1.5
--- php-src/ext/mysqli/tests/bug31668.phpt:1.4 Mon May 7 17:23:04 2007
+++ php-src/ext/mysqli/tests/bug31668.phpt Thu Aug 9 09:43:28 2007
@@ -1,15 +1,18 @@
--TEST--
Bug #31668 (multi_query works exactly every other time (multi_query was
global, now per connection))
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
- $mysql = new mysqli($host, $user, $passwd, "test");
+ $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
$mysql->multi_query('SELECT 1;SELECT 2');
do {
- $res = $mysql->store_result();
+ $res = $mysql->store_result();
if ($mysql->errno == 0) {
while ($arr = $res->fetch_assoc()) {
var_dump($arr);
@@ -20,10 +23,10 @@
var_dump($mysql->error, __LINE__);
$mysql->close();
- $mysql = new mysqli($host, $user, $passwd, "test");
+ $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
$mysql->multi_query('SELECT 1;SELECT 2');
do {
- $res = $mysql->store_result();
+ $res = $mysql->store_result();
if ($mysql->errno == 0) {
while ($arr = $res->fetch_assoc()) {
var_dump($arr);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug32405.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/bug32405.phpt
diff -u php-src/ext/mysqli/tests/bug32405.phpt:1.4
php-src/ext/mysqli/tests/bug32405.phpt:1.5
--- php-src/ext/mysqli/tests/bug32405.phpt:1.4 Mon May 7 17:23:04 2007
+++ php-src/ext/mysqli/tests/bug32405.phpt Thu Aug 9 09:43:28 2007
@@ -1,13 +1,16 @@
--TEST--
Bug #32405 (mysqli->fetch() is returning bad data)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include ("connect.inc");
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
mysqli_select_db($link, "test");
mysqli_query($link, "SET sql_mode=''");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug33090.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/bug33090.phpt
diff -u php-src/ext/mysqli/tests/bug33090.phpt:1.2
php-src/ext/mysqli/tests/bug33090.phpt:1.3
--- php-src/ext/mysqli/tests/bug33090.phpt:1.2 Mon May 7 17:23:04 2007
+++ php-src/ext/mysqli/tests/bug33090.phpt Thu Aug 9 09:43:28 2007
@@ -1,14 +1,17 @@
--TEST--
Bug #33090 (mysql_prepare doesn't return an error)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include ("connect.inc");
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
- mysqli_select_db($link, "test");
+ $link = mysqli_connect($host, $user, $passwd, null, $port, $socket);
+ mysqli_select_db($link, $db);
if (!($link->prepare("this makes no sense"))) {
printf("%d\n", $link->errno);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug33263.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/bug33263.phpt
diff -u php-src/ext/mysqli/tests/bug33263.phpt:1.4
php-src/ext/mysqli/tests/bug33263.phpt:1.5
--- php-src/ext/mysqli/tests/bug33263.phpt:1.4 Mon May 7 16:50:40 2007
+++ php-src/ext/mysqli/tests/bug33263.phpt Thu Aug 9 09:43:28 2007
@@ -1,8 +1,11 @@
--TEST--
Bug #33263 (mysqli_real_connect in __construct)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
@@ -10,13 +13,13 @@
class test extends mysqli
{
- public function __construct($host, $user, $passwd, $db) {
+ public function __construct($host, $user, $passwd, $db, $port,
$socket) {
parent::init();
- parent::real_connect($host, $user, $passwd, $db);
+ parent::real_connect($host, $user, $passwd, $db, $port,
$socket);
}
}
- $mysql = new test($host, $user, $passwd, "test");
+ $mysql = new test($host, $user, $passwd, $db, $port, $socket);
$stmt = $mysql->prepare("SELECT DATABASE()");
$stmt->execute();
@@ -26,7 +29,7 @@
var_dump($db);
- $mysql->close();
+ $mysql->close();
?>
--EXPECTF--
%s(4) "test"
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug33491.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/bug33491.phpt
diff -u php-src/ext/mysqli/tests/bug33491.phpt:1.2
php-src/ext/mysqli/tests/bug33491.phpt:1.3
--- php-src/ext/mysqli/tests/bug33491.phpt:1.2 Thu Oct 13 21:26:08 2005
+++ php-src/ext/mysqli/tests/bug33491.phpt Thu Aug 9 09:43:28 2007
@@ -3,7 +3,10 @@
--INI--
error_reporting=4095
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
@@ -15,10 +18,10 @@
}
}
-require_once dirname(__FILE__)."/connect.inc";
+require_once("connect.inc");
// Segfault when using the DB class which extends mysqli
-$DB = new DB($host, $user, $passwd, '');
+$DB = new DB($host, $user, $passwd, $db, $port, $socket);
$DB->query_single('SELECT DATE()');
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug34785.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/bug34785.phpt
diff -u php-src/ext/mysqli/tests/bug34785.phpt:1.4
php-src/ext/mysqli/tests/bug34785.phpt:1.5
--- php-src/ext/mysqli/tests/bug34785.phpt:1.4 Mon May 7 17:23:04 2007
+++ php-src/ext/mysqli/tests/bug34785.phpt Thu Aug 9 09:43:28 2007
@@ -1,7 +1,10 @@
--TEST--
Bug #34785 (Can not properly subclass mysqli_stmt)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include ("connect.inc");
@@ -21,7 +24,7 @@
}
/*** test mysqli_connect 127.0.0.1 ***/
- $link = mysqli_connect($host, $user, $passwd);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
mysqli_query($link, "SET sql_mode=''");
$stmt = new my_stmt($link, "SELECT 'foo' FROM DUAL");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug34810.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/bug34810.phpt
diff -u php-src/ext/mysqli/tests/bug34810.phpt:1.4
php-src/ext/mysqli/tests/bug34810.phpt:1.5
--- php-src/ext/mysqli/tests/bug34810.phpt:1.4 Mon May 7 16:50:40 2007
+++ php-src/ext/mysqli/tests/bug34810.phpt Thu Aug 9 09:43:28 2007
@@ -1,7 +1,10 @@
--TEST--
Bug #34810 (mysqli::init() and others use wrong $this pointer without checks)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
@@ -9,13 +12,13 @@
public function connect() {
include "connect.inc";
- $link = mysqli_connect($host, $user, $passwd);
+ $link = mysqli_connect($host, $user, $passwd, $db, $port,
$socket);
var_dump($link);
$link = mysqli_init();
var_dump($link);
- $mysql = new mysqli($host, $user, $passwd, "test");
+ $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
$mysql->query("DROP TABLE IF EXISTS test_warnings");
$mysql->query("CREATE TABLE test_warnings (a int not null)");
$mysql->query("SET sql_mode=''");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug35103.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/bug35103.phpt
diff -u php-src/ext/mysqli/tests/bug35103.phpt:1.3
php-src/ext/mysqli/tests/bug35103.phpt:1.4
--- php-src/ext/mysqli/tests/bug35103.phpt:1.3 Mon May 7 16:50:40 2007
+++ php-src/ext/mysqli/tests/bug35103.phpt Thu Aug 9 09:43:28 2007
@@ -1,7 +1,10 @@
--TEST--
Bug #35103 (Bad handling of unsigned bigint)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
@@ -11,7 +14,7 @@
EOSQL;
include "connect.inc";
- $mysql = new mysqli($host, $user, $passwd, "test");
+ $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
$mysql->query("DROP TABLE IF EXISTS test_bint");
$mysql->query("CREATE TABLE test_bint (a bigint(20) default NULL)
ENGINE=MYISAM");
$mysql->query("INSERT INTO test_bint VALUES
(9223372036854775807),(-9223372036854775808),(-2147483648),(-2147483649),(-2147483647),(2147483647),(2147483648),(2147483649)");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug35517.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/bug35517.phpt
diff -u php-src/ext/mysqli/tests/bug35517.phpt:1.4
php-src/ext/mysqli/tests/bug35517.phpt:1.5
--- php-src/ext/mysqli/tests/bug35517.phpt:1.4 Mon May 7 17:23:04 2007
+++ php-src/ext/mysqli/tests/bug35517.phpt Thu Aug 9 09:43:28 2007
@@ -1,12 +1,15 @@
--TEST--
Bug #35517 (mysqli_stmt_fetch returns NULL)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
- $mysql = new mysqli($host, $user, $passwd, "test");
+ $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
$mysql->query("CREATE TABLE temp (id INT UNSIGNED NOT NULL)");
$mysql->query("INSERT INTO temp (id) VALUES
(3000000897),(3800001532),(3900002281),(3100059612)");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug35759.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/bug35759.phpt
diff -u php-src/ext/mysqli/tests/bug35759.phpt:1.3
php-src/ext/mysqli/tests/bug35759.phpt:1.4
--- php-src/ext/mysqli/tests/bug35759.phpt:1.3 Mon May 7 16:50:40 2007
+++ php-src/ext/mysqli/tests/bug35759.phpt Thu Aug 9 09:43:28 2007
@@ -1,7 +1,10 @@
--TEST--
Bug #35759 (mysqli_stmt_bind_result() makes huge allocation when column empty)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
@@ -14,7 +17,7 @@
include "connect.inc";
$col_num= 1000;
- $mysql = new mysqli($host, $user, $passwd, "test");
+ $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
$mysql->query("DROP TABLE IF EXISTS blobby");
$create = "CREATE TABLE blobby (a0 MEDIUMBLOB NOT NULL DEFAULT ''";
$i= 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug36420.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/bug36420.phpt
diff -u php-src/ext/mysqli/tests/bug36420.phpt:1.2
php-src/ext/mysqli/tests/bug36420.phpt:1.3
--- php-src/ext/mysqli/tests/bug36420.phpt:1.2 Mon May 7 16:50:40 2007
+++ php-src/ext/mysqli/tests/bug36420.phpt Thu Aug 9 09:43:28 2007
@@ -1,12 +1,15 @@
--TEST--
Bug #36420 (segfault when access result->num_rows after calling
result->close())
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
-$mysqli = mysqli_connect($host, $user, $passwd);
+$mysqli = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
$result = $mysqli->query('select 1');
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug36745.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqli/tests/bug36745.phpt
diff -u php-src/ext/mysqli/tests/bug36745.phpt:1.5
php-src/ext/mysqli/tests/bug36745.phpt:1.6
--- php-src/ext/mysqli/tests/bug36745.phpt:1.5 Mon May 7 16:50:40 2007
+++ php-src/ext/mysqli/tests/bug36745.phpt Thu Aug 9 09:43:28 2007
@@ -1,13 +1,16 @@
--TEST--
Bug #36745 (LOAD DATA LOCAL INFILE doesn't return correct error message)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include ("connect.inc");
/*** test mysqli_connect 127.0.0.1 ***/
- $mysql = mysqli_connect($host, $user, $passwd, "test");
+ $mysql = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
$mysql->query("DROP TABLE IF EXISTS litest");
$mysql->query("CREATE TABLE litest (a VARCHAR(20))");
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug36949.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/bug36949.phpt
diff -u php-src/ext/mysqli/tests/bug36949.phpt:1.3
php-src/ext/mysqli/tests/bug36949.phpt:1.4
--- php-src/ext/mysqli/tests/bug36949.phpt:1.3 Mon May 7 16:50:40 2007
+++ php-src/ext/mysqli/tests/bug36949.phpt Thu Aug 9 09:43:28 2007
@@ -1,18 +1,20 @@
--TEST--
Bug #36949 (invalid internal mysqli objects dtor)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
-
class A {
private $mysqli;
public function __construct() {
- global $user, $host, $passwd;
- $this->mysqli = new mysqli($host, $user, $passwd);
+ global $user, $host, $passwd, $db, $port, $socket;
+ $this->mysqli = new mysqli($host, $user, $passwd, $db, $port,
$socket);
$result = $this->mysqli->query("SELECT NOW() AS my_time FROM
DUAL");
$row = $result->fetch_object();
echo $row->my_time."<br>\n";
@@ -29,8 +31,8 @@
private $mysqli;
public function __construct() {
- global $user, $host, $passwd;
- $this->mysqli = new mysqli($host, $user, $passwd);
+ global $user, $host, $passwd, $db, $port, $socket;
+ $this->mysqli = new mysqli($host, $user, $passwd, $db, $port,
$socket);
$result = $this->mysqli->query("SELECT NOW() AS my_time FROM
DUAL");
$row = $result->fetch_object();
echo $row->my_time."<br>\n";
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug38710.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqli/tests/bug38710.phpt
diff -u php-src/ext/mysqli/tests/bug38710.phpt:1.3
php-src/ext/mysqli/tests/bug38710.phpt:1.4
--- php-src/ext/mysqli/tests/bug38710.phpt:1.3 Sun Mar 25 01:15:41 2007
+++ php-src/ext/mysqli/tests/bug38710.phpt Thu Aug 9 09:43:28 2007
@@ -1,18 +1,24 @@
--TEST--
Bug #38710 (data leakage because of nonexisting boundary checking in
statements)
--SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?>
--FILE--
<?php
include "connect.inc";
-$db = new mysqli($host, $user, $passwd, "test");
+$db = new mysqli($host, $user, $passwd, $db, $port, $socket);
$qry=$db->stmt_init();
$qry->prepare("SELECT REPEAT('a',100000)");
$qry->execute();
$qry->bind_result($text);
$qry->fetch();
-var_dump($text);
+if ($text !== str_repeat('a', ($IS_MYSQLND || mysqli_get_server_version($db) >
50110)? 100000:(mysqli_get_server_version($db)>=50000? 8193:8191))) {
+ var_dump(strlen($text));
+}
+echo "Done";
?>
--EXPECTF--
-string(8193)
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaa"
+Done
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
