Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop

1 files changed, 2 insertions, 2 deletions

diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php
index 2d2905c98..6ceaf4b9b 100644
--- a/system/database/drivers/mysql/mysql_result.php
+++ b/system/database/drivers/mysql/mysql_result.php
@@ -86,10 +86,10 @@ class CI_DB_mysql_result extends CI_DB_result {
 		$retval = array();
 		while ($field = mysql_fetch_object($this->result_id))
 		{
-			preg_match('/([a-zA-Z]+)\((\d+)\)/', $field->Type, $matches);
+			preg_match('/([a-zA-Z]+)(\((\d+)\))?/i', $field->Type, $matches);
 
 			$type = $matches[1];
-			$length = (int)$matches[2];
+			$length = isset($matches[3]) ? (int) $matches[3] : NULL;
 
 			$F				= new stdClass();
 			$F->name		= $field->Field;