Index: upgrade.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- upgrade.php	(revision )
+++ upgrade.php	(revision )
@@ -2221,8 +2221,11 @@
 			if (array_key_exists(strtolower($tablefield->Field), $cfields)) {
 
 				// Get the field type from the query.
-				preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches);
+				if ( preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches) ) {
-				$fieldtype = $matches[1];
+					$fieldtype = $matches[1];
+				} else {
+					$fieldtype = null;
+				}
 
 				// Is actual field type different from the field type in query?
 				if ($tablefield->Type != $fieldtype) {