summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/oci8/oci8_driver.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-01 18:49:00 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-01 18:49:00 +0100
commit66f70774b937cff128bcdedc2bd029bad34dce84 (patch)
tree767cfc8e812e95206f1394e888d6cedbcf13a576 /system/database/drivers/oci8/oci8_driver.php
parent891b7c6ea68a87127d51eb01b401a948f6ae3753 (diff)
parente3a68042c086acfc98ae273adbd8527af0c6ab8b (diff)
Merge upstream branch
Diffstat (limited to 'system/database/drivers/oci8/oci8_driver.php')
-rw-r--r--system/database/drivers/oci8/oci8_driver.php16
1 files changed, 0 insertions, 16 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 057095c23..d9acaaea6 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -139,22 +139,6 @@ class CI_DB_oci8_driver extends CI_DB {
// --------------------------------------------------------------------
/**
- * Set client character set
- *
- * @access public
- * @param string
- * @param string
- * @return resource
- */
- public function db_set_charset($charset, $collation)
- {
- // this is done upon connect
- return TRUE;
- }
-
- // --------------------------------------------------------------------
-
- /**
* Version number query string
*
* @access protected