com php-src: Fix mysqli tests: ext/mysqli/tests/mysqli_change _user_new.phpt ext/mysqli/tests/mysqli_pam_sha2 56_public_key_ini.phpt

Commit: 2b23ba97f320aa5bbaa9c14380f16415b5f14549 Author: Andrey Hristov <andrey@php.net> Wed, 28 Oct 2015 12:55:41 +0100 Parents: 5dd59cc90d8b38250e4414684a55cc4ad346fde6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2b23ba97f320aa5bbaa9c14380f16415b5f14549 Log: Fix mysqli tests Changed paths: M ext/mysqli/tests/mysqli_change_user_new.phpt M ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt Diff: diff --git a/ext/mysqli/tests/mysqli_change_user_new.phpt b/ext/mysqli/tests/mysqli_change_user_new.phpt index 0820a20..ec6b3e3 100644 --- a/ext/mysqli/tests/mysqli_change_user_new.phpt +++ b/ext/mysqli/tests/mysqli_change_user_new.phpt @@ -30,8 +30,8 @@ if (mysqli_get_server_version($link) < 50600) if (!$res = mysqli_query($link, 'SELECT 1 AS _one')) printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - - var_dump($res->fetch_assoc()); + else + var_dump($res->fetch_assoc()); print "done!"; ?> @@ -40,5 +40,4 @@ Warning: mysqli_query(): MySQL server has gone away in %s on line %d Warning: mysqli_query(): Error reading result set's header in %s on line %d [003] [2006] MySQL server has gone away - -Fatal error: Call to a member function fetch_assoc() on %s in %s on line %d +done! diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt index 27bbed1..7083573 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt @@ -124,6 +124,6 @@ mysqlnd.sha256_server_public_key="test_sha256_ini" ?> --EXPECTF-- -Warning: mysqli::mysqli(): (HY000/1045): %s in %s on line %d +Warning: mysqli::__construct(): (HY000/1045): %s in %s on line %d [001] [1045] %s done! \ No newline at end of file