diff options
| author | Christopher Jones <sixd@php.net> | 2015-10-07 20:27:38 +1100 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2015-10-07 20:27:38 +1100 |
| commit | 19e461b07d6b3f1f9f86ec7bcf7d0c5ca319cf77 (patch) | |
| tree | 6f4bf88aef2b14e35f38993d5efb08252a5dc1c5 | |
| parent | 4a57f1821b2ff555d1d57bb961c1ceadbcffc115 (diff) | |
| parent | ccb677ece8cc00aca9e2ad7662a24274efd671f7 (diff) | |
| download | php-git-19e461b07d6b3f1f9f86ec7bcf7d0c5ca319cf77.tar.gz | |
Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0
* 'PHP-7.0' of https://git.php.net/repository/php-src:
Fixed test running on MarinaDB.
| -rw-r--r-- | ext/pdo_mysql/tests/bug54929.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_mysql/tests/bug54929.phpt b/ext/pdo_mysql/tests/bug54929.phpt index 84b9e7d04f..0a111d8935 100644 --- a/ext/pdo_mysql/tests/bug54929.phpt +++ b/ext/pdo_mysql/tests/bug54929.phpt @@ -54,7 +54,7 @@ array(3) { [1]=> int(1064) [2]=> - string(149) "You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near '--'' at line 1" + string(%d) "You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near '--'' at line 1" } array(1) { ["f1"]=> |