diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-06-20 13:58:26 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-06-20 13:58:26 +0400 |
| commit | f08a5bfadc360cb53574bdb2f4dc32ac30636133 (patch) | |
| tree | baef48faa90b12f5b20f1fb6b63da0584d2d5729 /ext/mysql | |
| parent | e9c9169e05e0f9753151c16e6a0806f9c5c614bb (diff) | |
| parent | f0639611cf65a8a35119e65bad6f472346b14543 (diff) | |
| download | php-git-f08a5bfadc360cb53574bdb2f4dc32ac30636133.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed MarinaDB support
Diffstat (limited to 'ext/mysql')
| -rw-r--r-- | ext/mysql/tests/mysql_trace_mode.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysql/tests/mysql_trace_mode.phpt b/ext/mysql/tests/mysql_trace_mode.phpt index 7655975d70..73872de1db 100644 --- a/ext/mysql/tests/mysql_trace_mode.phpt +++ b/ext/mysql/tests/mysql_trace_mode.phpt @@ -31,7 +31,7 @@ require_once("clean_table.inc"); --EXPECTF-- Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d I don\'t mind character sets, do I?\n -Warning: mysql_query(): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BOGUS_SQL' at line 1 in %s on line %d +Warning: mysql_query(): 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 'BOGUS_SQL' at line 1 in %s on line %d done! Warning: Unknown: 1 result set(s) not freed. Use mysql_free_result to free result sets which were requested using mysql_query() in %s on line %d |