summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-02-06 04:36:47 +0100
committerAndrey Andreev <narf@devilix.net>2014-02-06 04:36:47 +0100
commitdf7a6962beacc34b217dab61da8526f6570391e8 (patch)
tree76c9f03d359368830578b23e54d1d5b34ff5cbfa /system/database
parente8088d693d6bd8b08c1cdc397bbdebd7067844a5 (diff)
parent3aa781a65267d72000009df0fa2feee5cb3bdd8d (diff)
Merge changes from develop
Diffstat (limited to 'system/database')
-rw-r--r--system/database/drivers/odbc/odbc_driver.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index 45e91cbc5..6f635bdfb 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -222,7 +222,7 @@ class CI_DB_odbc_driver extends CI_DB {
*/
public function affected_rows()
{
- return @odbc_num_rows($this->conn_id);
+ return @odbc_num_rows($this->result_id);
}
// --------------------------------------------------------------------