summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2012-12-13 16:42:33 -0800
committerRasmus Lerdorf <rasmus@php.net>2012-12-13 16:42:33 -0800
commitd8455492577e093e5aa0fc18fcf199082098987a (patch)
tree8ff014c0ddaee2800ef5d46e761d2544e31d5a45
parent538d8338c03e7442acabd014e142893aa344de62 (diff)
parent9d1bc1b622f1c28a55fe4dc4e87e111aff6ed8b8 (diff)
downloadphp-git-d8455492577e093e5aa0fc18fcf199082098987a.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
-rw-r--r--ext/mysqli/tests/bug63398.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/tests/bug63398.phpt b/ext/mysqli/tests/bug63398.phpt
index 6dffa8c1f6..26d00c9420 100644
--- a/ext/mysqli/tests/bug63398.phpt
+++ b/ext/mysqli/tests/bug63398.phpt
@@ -10,7 +10,7 @@ if (!$IS_MYSQLND) {
?>
--FILE--
<?php
-$link = new mysqli('localhost', 'test', NULL, 'test');
+$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
mysqli_close($link);