diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-01-27 20:08:15 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-01-27 20:08:15 +0100 |
commit | 6e0786987bf8c887abb848e4f82111f029ebb001 (patch) | |
tree | 3a6f2efc92fa686c1a6a8774bc8e1774311ef3c9 /system/database/DB_driver.php | |
parent | 993f932cb27f68ac4a3272502a823af0835b291c (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 82e5d0486..566779d0e 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', 'sqlsrv'); + $driver_version_exceptions = array('oci8', 'sqlite', 'cubrid', 'pdo', 'mysqli', 'sqlsrv'); if (in_array($this->dbdriver, $driver_version_exceptions)) { |