aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_install.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-12-31 00:54:31 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-12-31 00:54:31 +0100
commit3a0e98a3bd7d579a9073a44d266b7b531c71e622 (patch)
tree618d75242be6c3a8aab2f9e1b2219bff049895a4 /phpBB/includes/functions_install.php
parent4dcc8cabae670e0ee57a489e7e13c2f93d99753a (diff)
parentcbe91e5b5096dc1ed659530632f0fa64d75e8dd9 (diff)
downloadforums-3a0e98a3bd7d579a9073a44d266b7b531c71e622.tar
forums-3a0e98a3bd7d579a9073a44d266b7b531c71e622.tar.gz
forums-3a0e98a3bd7d579a9073a44d266b7b531c71e622.tar.bz2
forums-3a0e98a3bd7d579a9073a44d266b7b531c71e622.tar.xz
forums-3a0e98a3bd7d579a9073a44d266b7b531c71e622.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11293] Add a note that mysqli should be in front of mysql.
Diffstat (limited to 'phpBB/includes/functions_install.php')
-rw-r--r--phpBB/includes/functions_install.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index edb2c35fee..8978e3fadd 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -32,6 +32,8 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
'AVAILABLE' => true,
'2.0.x' => false,
),
+ // Note: php 5.5 alpha 2 deprecated mysql.
+ // Keep mysqli before mysql in this list.
'mysqli' => array(
'LABEL' => 'MySQL with MySQLi Extension',
'SCHEMA' => 'mysql_41',