diff options
| author | Anatol Belski <ab@php.net> | 2016-12-04 22:45:31 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-12-04 22:45:31 +0100 |
| commit | 8ad9043aa33ea3c4d5a97b543ff9b805cb380e7b (patch) | |
| tree | b077090e358d797dfd02890df77e1c480b2d533f /ext/mysqli | |
| parent | b6f5fcfc3afbb176fa54469d27b80aa3b568d7f3 (diff) | |
| parent | eddca73ad2b3db7a3700b703e2a98e710ed0ae8d (diff) | |
| download | php-git-8ad9043aa33ea3c4d5a97b543ff9b805cb380e7b.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/tests/mysqli_expire_password.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/tests/mysqli_expire_password.phpt b/ext/mysqli/tests/mysqli_expire_password.phpt index 4fdf902c79..6ce5eeaacc 100644 --- a/ext/mysqli/tests/mysqli_expire_password.phpt +++ b/ext/mysqli/tests/mysqli_expire_password.phpt @@ -127,10 +127,10 @@ if (!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO expiretest@'% ?> --EXPECTF-- -Warning: mysqli_real_connect(): (HY000/1862): %s in %s on line %d +Warning: mysqli%sconnect(): (HY000/1862): %s in %s on line %d [001] Cannot connect [1862] %s -Warning: mysqli_real_connect(): (HY000/1862): %s in %s on line %d +Warning: mysqli%sconnect(): (HY000/1862): %s in %s on line %d [003] Cannot connect [1862] %s [006] Connect allowed, query fail, [1820] %s [008] Connect allowed, pw set, [0%A |