Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11293] Add a note that mysqli should be in front of mysql.
This commit is contained in:
Andreas Fischer 2012-12-31 00:54:31 +01:00
commit 3a0e98a3bd

View file

@ -32,6 +32,8 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => false, '2.0.x' => false,
), ),
// Note: php 5.5 alpha 2 deprecated mysql.
// Keep mysqli before mysql in this list.
'mysqli' => array( 'mysqli' => array(
'LABEL' => 'MySQL with MySQLi Extension', 'LABEL' => 'MySQL with MySQLi Extension',
'SCHEMA' => 'mysql_41', 'SCHEMA' => 'mysql_41',