diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-01-27 20:13:52 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-01-27 20:13:52 +0100 |
commit | 7a189e81c0335f0d3667c1e8270f06137177d9b0 (patch) | |
tree | 082299080d2364538de758d05b49b15a89938aa9 /system/database/DB_driver.php | |
parent | fb86295d7d49e7ddfba266fe9f7305fb44708d4f (diff) | |
parent | 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7 (diff) |
Merge upstream branch
Diffstat (limited to 'system/database/DB_driver.php')
-rw-r--r-- | system/database/DB_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 661b42ced..7445a5069 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -257,7 +257,7 @@ class CI_DB_driver { // Some DBs have functions that return the version, and don't run special // SQL queries per se. In these instances, just return the result. - $driver_version_exceptions = array('oci8', 'sqlite', 'cubrid', 'pdo'); + $driver_version_exceptions = array('oci8', 'sqlite', 'cubrid', 'pdo', 'mysqli'); if (in_array($this->dbdriver, $driver_version_exceptions)) { |