georg Fri Mar 24 10:58:52 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli/tests 017.phpt 049.phpt bug34810.phpt
Log:
fixed minor problems (thx to tony)
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/tests/017.phpt?r1=1.7&r2=1.7.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/017.phpt
diff -u php-src/ext/mysqli/tests/017.phpt:1.7
php-src/ext/mysqli/tests/017.phpt:1.7.2.1
--- php-src/ext/mysqli/tests/017.phpt:1.7 Fri Jan 7 14:59:59 2005
+++ php-src/ext/mysqli/tests/017.phpt Fri Mar 24 10:58:52 2006
@@ -12,15 +12,13 @@
mysqli_select_db($link, "test");
- $stmt = mysqli_prepare($link, "SELECT current_user(), database(),
'foo'");
+ $stmt = mysqli_prepare($link, "SELECT md5('bar'), database(), 'foo'");
mysqli_bind_result($stmt, $c0, $c1, $c2);
mysqli_execute($stmt);
mysqli_fetch($stmt);
mysqli_stmt_close($stmt);
- $c0 = ($c0 == $user . "@" . $host) ? 1 : 0;
-
$test = array($c0, $c1, $c2);
var_dump($test);
@@ -29,7 +27,7 @@
--EXPECT--
array(3) {
[0]=>
- int(1)
+ string(32) "37b51d194a7513e45b56f6524f2d51f2"
[1]=>
string(4) "test"
[2]=>
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/tests/049.phpt?r1=1.4&r2=1.4.2.1&diff_format=u
Index: php-src/ext/mysqli/tests/049.phpt
diff -u php-src/ext/mysqli/tests/049.phpt:1.4
php-src/ext/mysqli/tests/049.phpt:1.4.2.1
--- php-src/ext/mysqli/tests/049.phpt:1.4 Fri Jan 7 14:59:59 2005
+++ php-src/ext/mysqli/tests/049.phpt Fri Mar 24 10:58:52 2006
@@ -11,14 +11,16 @@
$mysql = mysqli_connect($host, $user, $passwd);
$mysql->select_db("test");
- $result = $mysql->query("SELECT CURRENT_USER()");
+ $result = $mysql->query("SELECT DATABASE()");
$row = $result->fetch_row();
$result->close();
- $ok = ($row[0] == $user . "@" . $host);
- var_dump($ok);
+ var_dump($row);
$mysql->close();
?>
--EXPECT--
-bool(true)
+array(1) {
+ [0]=>
+ string(4) "test"
+}
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/tests/bug34810.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/mysqli/tests/bug34810.phpt
diff -u php-src/ext/mysqli/tests/bug34810.phpt:1.1.2.2
php-src/ext/mysqli/tests/bug34810.phpt:1.1.2.3
--- php-src/ext/mysqli/tests/bug34810.phpt:1.1.2.2 Fri Mar 24 09:32:24 2006
+++ php-src/ext/mysqli/tests/bug34810.phpt Fri Mar 24 10:58:52 2006
@@ -9,10 +9,10 @@
public function connect() {
include "connect.inc";
- $link = mysqli::connect($host, $user, $passwd);
+ $link = mysqli_connect($host, $user, $passwd);
var_dump($link);
- $link = mysqli::init();
+ $link = mysqli_init();
var_dump($link);
$mysql = new mysqli($host, $user, $passwd, "test");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
