summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/pdo/pdo_result.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-04-26 23:15:36 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-04-26 23:15:36 +0200
commitba4636187a745a287c81517fbc53f2f30fe16d88 (patch)
treebdcb56cc80e72735d0118f3abf91e04f0dfba5cd /system/database/drivers/pdo/pdo_result.php
parentcdfbd5281e4dec7278a07943832c2590c1141eb3 (diff)
parentf3b0074b0ccaadef31737cbd6be21ec7272f7538 (diff)
Fixed conflicts.
Diffstat (limited to 'system/database/drivers/pdo/pdo_result.php')
-rw-r--r--system/database/drivers/pdo/pdo_result.php17
1 files changed, 0 insertions, 17 deletions
diff --git a/system/database/drivers/pdo/pdo_result.php b/system/database/drivers/pdo/pdo_result.php
index 5bbd85d75..19aee1dfc 100644
--- a/system/database/drivers/pdo/pdo_result.php
+++ b/system/database/drivers/pdo/pdo_result.php
@@ -92,7 +92,6 @@ class CI_DB_pdo_result extends CI_DB_result {
$res_handler = 'result_'.$type;
$this->$res_handler = array();
- $this->_data_seek(0);
while ($row = $this->$res_method())
{
@@ -228,22 +227,6 @@ class CI_DB_pdo_result extends CI_DB_result {
// --------------------------------------------------------------------
/**
- * Data Seek
- *
- * Moves the internal pointer to the desired offset. We call
- * this internally before fetching results to make sure the
- * result set starts at zero
- *
- * @return bool
- */
- protected function _data_seek($n = 0)
- {
- return FALSE;
- }
-
- // --------------------------------------------------------------------
-
- /**
* Result - associative array
*
* Returns the result set as an array