Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed MarinaDB support

diff --cc ext/mysql/tests/mysql_trace_mode.phpt
index 7655975d70c6552b452d1a670c8bcd10101626a8,45f4f9fd611be2ab708b50834abeef17d051dd43..73872de1dbddb5eb839f4e89a1e68bf5fe49dcda
--- 1/ext/mysql/tests/mysql_trace_mode.phpt
--- 2/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