# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /home/sidney/NetBeansProjects/trunk_project/EE_trunk/wp-admin/includes
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: upgrade.php
--- upgrade.php Base (BASE)
+++ upgrade.php Locally Modified (Based On LOCAL)
@@ -1586,9 +1586,12 @@
 				// Get the field type from the query
 				preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches);
 				$fieldtype = $matches[1];
-
+				$bools = array('boolean', 'bool', 'BOOLEAN', 'BOOL');
+				if (in_array($fieldtype, $bools)) {
+					$fieldtype = 'tinyint(1)';
+				}
 				// Is actual field type different from the field type in query?
-				if ($tablefield->Type != $fieldtype) {
+				if (strcasecmp($tablefield->Type, $fieldtype) !=0) {
 					// Add a query to change the column type
 					$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} " . $cfields[strtolower($tablefield->Field)];
 					$for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";