diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-01-27 20:15:17 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-01-27 20:15:17 +0100 |
| commit | c323493380eba2f1418380f35db0c0bf52b82838 (patch) | |
| tree | f6dc601d0e9af7c15b41d746cc76de0c7da3501a /system/database/DB_driver.php | |
| parent | f1993c825f568e0ab5d08a8810f96363f0713dad (diff) | |
| parent | 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop-db-driver
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 113c3d3fe..03fc8a698 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -247,7 +247,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)) { |