summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorRepox <storm@err0r.dk>2011-11-24 09:14:04 +0100
committerRepox <storm@err0r.dk>2011-11-24 09:14:04 +0100
commit5fb9a59e6d485ebdbc03fb4bb4f7fb2115246e3a (patch)
tree3c3d32df2e7d461a425d509be96c082c061f6711 /system/database
parente45f28c5ab7509ade2a9db0cd574d8a688bc4c3b (diff)
parentc72e172f158747b75ee524b46f5819c4bf3d0eaa (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index dd1b5677a..cc40ba48a 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -522,6 +522,7 @@ class CI_DB_driver {
}
$this->trans_begin($test_mode);
+ $this->_trans_depth += 1;
}
// --------------------------------------------------------------------
@@ -545,6 +546,10 @@ class CI_DB_driver {
$this->_trans_depth -= 1;
return TRUE;
}
+ else
+ {
+ $this->_trans_depth = 0;
+ }
// The query() function will set this flag to FALSE in the event that a query failed
if ($this->_trans_status === FALSE)