diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-02-01 23:53:13 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-02-01 23:53:13 +0100 |
| commit | a2710f435fa569d29a02603699e450506429f33b (patch) | |
| tree | d1aaa60900bfd731d889d716b6a78d2347b0295f /system/database/DB_driver.php | |
| parent | b537c4d32d109cef2ddf541aa976c3e96736bf06 (diff) | |
| parent | 27c80af1dd9b871ab44452a8de22fd9cabaa184c (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop-db-sqlite
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)) { |