summaryrefslogtreecommitdiffstats
path: root/system/database/DB_driver.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-01 23:54:00 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-01 23:54:00 +0100
commit2d002723f9a9677d613a91df953d7dcf9f4361e7 (patch)
treedf3428dbd3bde5597f4f187116bcc4356743b304 /system/database/DB_driver.php
parentb76029d8be1f2d98f1668d61e7f7ac3d9274b8f3 (diff)
parent27c80af1dd9b871ab44452a8de22fd9cabaa184c (diff)
Merge remote-tracking branch 'upstream/develop' into develop-db-odbc
Diffstat (limited to 'system/database/DB_driver.php')
-rw-r--r--system/database/DB_driver.php2
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))
{