summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/pdo
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-26 21:08:49 +0200
committerAndrey Andreev <narf@bofh.bg>2012-03-26 21:08:49 +0200
commit1a361209cf77133d2a38132cebe1db17df04a7d4 (patch)
tree9132215eecd4fae44e6dd3e24f5928b8a5d3cad9 /system/database/drivers/pdo
parent7fd46308949522f1c7c8853381c2ce7cea093c9a (diff)
parent5bc7a2393187a25f832f18552dbdb8defb23e9d1 (diff)
Merge upstream branch
Diffstat (limited to 'system/database/drivers/pdo')
-rw-r--r--system/database/drivers/pdo/pdo_driver.php22
1 files changed, 1 insertions, 21 deletions
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php
index 0295b9d56..f336eb0ab 100644
--- a/system/database/drivers/pdo/pdo_driver.php
+++ b/system/database/drivers/pdo/pdo_driver.php
@@ -247,26 +247,6 @@ class CI_DB_pdo_driver extends CI_DB {
// --------------------------------------------------------------------
/**
- * Reconnect
- *
- * Keep / reestablish the db connection if no queries have been
- * sent for a length of time exceeding the server's idle timeout
- *
- * @return void
- */
- public function reconnect()
- {
- if ($this->db->db_debug)
- {
- return $this->db->display_error('db_unsuported_feature');
- }
-
- return FALSE;
- }
-
- // --------------------------------------------------------------------
-
- /**
* Select the database
*
* @return resource
@@ -504,7 +484,7 @@ class CI_DB_pdo_driver extends CI_DB {
* @param string
* @return string
*/
- function count_all($table = '')
+ public function count_all($table = '')
{
if ($table == '')
{