summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/mysql
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-02-25 15:18:38 +0100
committerDerek Allard <derek.allard@ellislab.com>2008-02-25 15:18:38 +0100
commit9a4d1da5fa823b6bb58cdd1d210f782e95830e91 (patch)
treeef9737987a75afadaac4d525570ab3675301681c /system/database/drivers/mysql
parent80ddb6b70f97c8b08f02b0d8dcffbc6ab136555c (diff)
Fixed an AR_caching error where it wasn't tracking table aliases (#3463)
Diffstat (limited to 'system/database/drivers/mysql')
-rw-r--r--system/database/drivers/mysql/mysql_driver.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index edf09a170..2bc66ecf2 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -471,7 +471,7 @@ class CI_DB_mysql_driver extends CI_DB {
return "`{$item}`";
}
- $exceptions = array('AS', '/', '-', '%', '+', '*');
+ $exceptions = array('AS', '/', '-', '%', '+', '*', 'OR', 'IS');
foreach ($exceptions as $exception)
{