diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-06-27 14:02:13 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-06-27 14:02:13 +0200 |
| commit | 13077951b63cf9858dc14ec9cab7f2b53ec88a3e (patch) | |
| tree | e1fc50ddb8c0a4103c945f15d674d85c6655231b /system/database/drivers/mysqli | |
| parent | 9128231452f3ccea857a848b61bd0e6e9e319737 (diff) | |
| parent | b66664b5decd68de50ae6c239c8d995d6c088d94 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'system/database/drivers/mysqli')
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_driver.php | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index d3fb77a22..d1581bf1a 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -335,7 +335,7 @@ class CI_DB_mysqli_driver extends CI_DB { */ protected function _list_tables($prefix_limit = FALSE) { - $sql = 'SHOW TABLES FROM '.$this->_escape_char.$this->database.$this->_escape_char; + $sql = 'SHOW TABLES FROM '.$this->escape_identifiers($this->database); if ($prefix_limit !== FALSE && $this->dbprefix !== '') { @@ -455,24 +455,6 @@ class CI_DB_mysqli_driver extends CI_DB { // -------------------------------------------------------------------- /** - * Limit string - * - * Generates a platform-specific LIMIT clause - * - * @param string the sql query string - * @param int the number of rows to limit the query to - * @param int the offset value - * @return string - */ - protected function _limit($sql, $limit, $offset) - { - return $sql.' LIMIT '.$limit - .($offset > 0 ? ' OFFSET '.$offset : ''); - } - - // -------------------------------------------------------------------- - - /** * Close DB Connection * * @return void |