uw                                       Mon, 21 Sep 2009 15:24:47 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=288537

Log:
Fixing test

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug45289.phpt
    U   php/php-src/trunk/ext/mysqli/tests/bug45289.phpt

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug45289.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug45289.phpt 2009-09-21 
15:24:42 UTC (rev 288536)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug45289.phpt 2009-09-21 
15:24:47 UTC (rev 288537)
@@ -7,29 +7,34 @@
 ?>
 --FILE--
 <?php
-       include("connect.inc");
        require('table.inc');

+       $link->close();
+
+       $link = mysqli_init();
+       if (!($link->real_connect($host, $user, $passwd, $db, $port, $socket)))
+               printf("[001] Cannot connect to the server using host=%s, 
user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+                       $host, $user, $db, $port, $socket);
+
        $id = 1;
        if (!($stmt = $link->prepare('SELECT id, label FROM test WHERE id=? 
LIMIT 1')))
-               printf("[001] [%d] %s\n", $link->errno, $link->error);
+               printf("[002] [%d] %s\n", $link->errno, $link->error);

        if (!$stmt->bind_param('i', $id) || !$stmt->execute())
-               printf("[002] [%d] %s\n", $stmt->errno, $stmt->error);
+               printf("[003] [%d] %s\n", $stmt->errno, $stmt->error);

        if ($res = $link->store_result()) {
-               printf("[003] Can store result!\n");
+               if ($IS_MYSQLND)
+                       printf("[004] Can store result!\n");
+               else
+                       printf("[004] [007] 
http://bugs.mysql.com/bug.php?id=47485\n";);
        } else {
-               printf("[003] [%d] %s\n", $link->errno, $link->error);
+               printf("[004] [%d] %s\n", $link->errno, $link->error);
        }
-
-       var_dump($res->fetch_assoc());
 ?>
 --CLEAN--
 <?php
        require_once("clean_table.inc");
 ?>
 --EXPECTF--
-[003] [0%s
-
-Fatal error: Call to a member function fetch_assoc() on a non-object in %s on 
line %d
+[004] [0%s

Modified: php/php-src/trunk/ext/mysqli/tests/bug45289.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/bug45289.phpt    2009-09-21 15:24:42 UTC 
(rev 288536)
+++ php/php-src/trunk/ext/mysqli/tests/bug45289.phpt    2009-09-21 15:24:47 UTC 
(rev 288537)
@@ -7,29 +7,34 @@
 ?>
 --FILE--
 <?php
-       include("connect.inc");
        require('table.inc');

+       $link->close();
+
+       $link = mysqli_init();
+       if (!($link->real_connect($host, $user, $passwd, $db, $port, $socket)))
+               printf("[001] Cannot connect to the server using host=%s, 
user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+                       $host, $user, $db, $port, $socket);
+
        $id = 1;
        if (!($stmt = $link->prepare('SELECT id, label FROM test WHERE id=? 
LIMIT 1')))
-               printf("[001] [%d] %s\n", $link->errno, $link->error);
+               printf("[002] [%d] %s\n", $link->errno, $link->error);

        if (!$stmt->bind_param('i', $id) || !$stmt->execute())
-               printf("[002] [%d] %s\n", $stmt->errno, $stmt->error);
+               printf("[003] [%d] %s\n", $stmt->errno, $stmt->error);

        if ($res = $link->store_result()) {
-               printf("[003] Can store result!\n");
+               if ($IS_MYSQLND)
+                       printf("[004] Can store result!\n");
+               else
+                       printf("[004] [007] 
http://bugs.mysql.com/bug.php?id=47485\n";);
        } else {
-               printf("[003] [%d] %s\n", $link->errno, $link->error);
+               printf("[004] [%d] %s\n", $link->errno, $link->error);
        }
-
-       var_dump($res->fetch_assoc());
 ?>
 --CLEAN--
 <?php
        require_once("clean_table.inc");
 ?>
 --EXPECTF--
-[003] [0%s
-
-Fatal error: Call to a member function fetch_assoc() on a non-object in %s on 
line %d
+[004] [0%s

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to