summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/odbc/odbc_driver.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-28 14:29:07 +0200
committerAndrey Andreev <narf@bofh.bg>2012-03-28 14:29:07 +0200
commit2efd029d012fedd421540d14b8a5759032c0b5c6 (patch)
tree4c8f91429a88b362f485fa0eaee7bba7f7683ca1 /system/database/drivers/odbc/odbc_driver.php
parent9602651a0d435b8ccef1965a154e8a33594de6f3 (diff)
parentbee6644ce280d8e72cc2db23c86d5f5f6973acf3 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-oci8
Diffstat (limited to 'system/database/drivers/odbc/odbc_driver.php')
-rw-r--r--system/database/drivers/odbc/odbc_driver.php13
1 files changed, 0 insertions, 13 deletions
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index ad773117f..ed901bd81 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -95,19 +95,6 @@ class CI_DB_odbc_driver extends CI_DB {
// --------------------------------------------------------------------
/**
- * Select the database
- *
- * @return resource
- */
- public function db_select()
- {
- // Not needed for ODBC
- return TRUE;
- }
-
- // --------------------------------------------------------------------
-
- /**
* Execute the query
*
* @param string an SQL query