summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/mysql/mysql_driver.php
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-08-25 14:24:06 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-08-25 14:24:06 +0200
commitbe72bd2d1cdba222bbbce547e1603de1e4ec7961 (patch)
tree850711b8f4e981fcd1bf51151b1d71d53f630076 /system/database/drivers/mysql/mysql_driver.php
parent4bc4c1476344f96ebb920677f608cb185a48eaed (diff)
parent9ff6336415f3da2a81142cb23343060df6196ebe (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database/drivers/mysql/mysql_driver.php')
-rw-r--r--system/database/drivers/mysql/mysql_driver.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index 28c75a5e3..f87cfea4b 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -385,6 +385,7 @@ class CI_DB_mysql_driver extends CI_DB {
}
$row = $query->row();
+ $this->_reset_select();
return (int) $row->numrows;
}
@@ -440,7 +441,7 @@ class CI_DB_mysql_driver extends CI_DB {
*/
function _field_data($table)
{
- return "SELECT * FROM ".$table." LIMIT 1";
+ return "DESCRIBE ".$table;
}
// --------------------------------------------------------------------