uw Wed, 09 Sep 2009 18:31:00 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288208
Log:
Andrey fixed the bug but the test was somewhat borked. Fixing test.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49027.phpt
U php/php-src/trunk/ext/mysqli/tests/bug49027.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49027.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49027.phpt 2009-09-09
18:21:09 UTC (rev 288207)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49027.phpt 2009-09-09
18:31:00 UTC (rev 288208)
@@ -9,20 +9,54 @@
<?php
include ("connect.inc");
- $link=mysqli_init();
- if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "SELECT 1")){
- echo "Broken 2!\n";
+ $link = mysqli_init();
+ if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "SELECT 1")) {
+ printf("[001] Cannot set INIT_COMMAND\n");
}
- if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "SELECT 13")){
- echo "Broken 2!\n";
+
+ if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port,
$socket)) {
+ printf("[002] Connect failed, [%d] %s\n",
mysqli_connect_errno(), mysqli_connect_error());
}
- require('table_real_connect.inc');
+ var_dump($link->query("SELECT 42")->fetch_row());
- var_dump($link->query("SELECT 42")->fetch_row());
+ if (!mysqli_query($link, "DROP TABLE IF EXISTS test") ||
+ !mysqli_query($link, sprintf("CREATE TABLE test(id INT)
ENGINE=%s", $engine))) {
+ printf("[003] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+ }
+
+ mysqli_close($link);
+
+ $link = mysqli_init();
+ if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "INSERT INTO test(id)
VALUES(1)")) {
+ printf("[004] Cannot set INIT_COMMAND\n");
+ }
+
+ if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port,
$socket)) {
+ printf("[005] Connect failed, [%d] %s\n",
mysqli_connect_errno(), mysqli_connect_error());
+ }
+
+ if (!$res = mysqli_query($link, "SELECT id FROM test"))
+ printf("[006] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+
+ var_dump(mysqli_fetch_assoc($res));
+
+ mysqli_free_result($res);
+ mysqli_close($link);
+
+ print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
array(1) {
[0]=>
%unicode|string%(2) "42"
}
+array(1) {
+ [%u|b%"id"]=>
+ %unicode|string%(1) "1"
+}
+done!
Modified: php/php-src/trunk/ext/mysqli/tests/bug49027.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/bug49027.phpt 2009-09-09 18:21:09 UTC
(rev 288207)
+++ php/php-src/trunk/ext/mysqli/tests/bug49027.phpt 2009-09-09 18:31:00 UTC
(rev 288208)
@@ -9,20 +9,54 @@
<?php
include ("connect.inc");
- $link=mysqli_init();
- if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "SELECT 1")){
- echo "Broken 2!\n";
+ $link = mysqli_init();
+ if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "SELECT 1")) {
+ printf("[001] Cannot set INIT_COMMAND\n");
}
- if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "SELECT 13")){
- echo "Broken 2!\n";
+
+ if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port,
$socket)) {
+ printf("[002] Connect failed, [%d] %s\n",
mysqli_connect_errno(), mysqli_connect_error());
}
- require('table_real_connect.inc');
+ var_dump($link->query("SELECT 42")->fetch_row());
- var_dump($link->query("SELECT 42")->fetch_row());
+ if (!mysqli_query($link, "DROP TABLE IF EXISTS test") ||
+ !mysqli_query($link, sprintf("CREATE TABLE test(id INT)
ENGINE=%s", $engine))) {
+ printf("[003] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+ }
+
+ mysqli_close($link);
+
+ $link = mysqli_init();
+ if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "INSERT INTO test(id)
VALUES(1)")) {
+ printf("[004] Cannot set INIT_COMMAND\n");
+ }
+
+ if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port,
$socket)) {
+ printf("[005] Connect failed, [%d] %s\n",
mysqli_connect_errno(), mysqli_connect_error());
+ }
+
+ if (!$res = mysqli_query($link, "SELECT id FROM test"))
+ printf("[006] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+
+ var_dump(mysqli_fetch_assoc($res));
+
+ mysqli_free_result($res);
+ mysqli_close($link);
+
+ print "done!";
?>
+--CLEAN--
+<?php
+ require_once("clean_table.inc");
+?>
--EXPECTF--
array(1) {
[0]=>
%unicode|string%(2) "42"
}
+array(1) {
+ [%u|b%"id"]=>
+ %unicode|string%(1) "1"
+}
+done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
