diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-02-01 23:48:11 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-02-01 23:48:11 +0100 |
| commit | 247e122495af3bb5fcd144df89efe9433ca1e31f (patch) | |
| tree | e79ade1671449820e4e15abe62e2ad1bdaa6f473 /system/database/DB_driver.php | |
| parent | a3d19c4ac63c4af1c2b823b0962e6be79e89d186 (diff) | |
| parent | 27c80af1dd9b871ab44452a8de22fd9cabaa184c (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop-image-lib
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)) { |