com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysql/tes ts/mysql_trace_mode.phpt

Commit: f0639611cf65a8a35119e65bad6f472346b14543 Author: Dmitry Stogov <dmitry@zend.com> Fri, 20 Jun 2014 13:57:38 +0400 Parents: 21c9a9388fc3c3b88a48a7e25c932e1e2c008b81 680ddabac1076690fd716c14287b861feea87600 Branches: PHP-5.5 PHP-5.6 master phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f0639611cf65a8a35119e65bad6f472346b14543 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed MarinaDB support Changed paths: MM ext/mysql/tests/mysql_trace_mode.phpt Diff: diff --cc ext/mysql/tests/mysql_trace_mode.phpt index 7655975,45f4f9f..73872de --- a/ext/mysql/tests/mysql_trace_mode.phpt +++ b/ext/mysql/tests/mysql_trace_mode.phpt @@@ -29,9 -29,8 +29,9 @@@ print "done!\n" 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