Merge changes from MySQL AB:

ChangeSet@1.2528.115.25  2007-08-27 18:18:14-06:00  tsmith@hindu.god

Fix some Windows compiler warnings.

dict0mem.c: Fix compiler warning with a cast.

ha_innodb.cc: Change type to fix a compiler warning.

dict/dict0mem.c

@@ -209,7 +209,7 @@ dict_mem_table_add_col(
 
 	col = (dict_col_t*) dict_table_get_nth_col(table, i);
 
-	col->ind = i;
+	col->ind = (unsigned int) i;
 	col->ord_part = 0;
 
 	col->mtype = (unsigned int) mtype;

handler/ha_innodb.cc

@@ -7233,7 +7233,7 @@ ha_innobase::innobase_get_auto_increment(
 /*=====================================*/
 	ulonglong*	value)		/* out: autoinc value */
 {
-	ulint		error;
+	ulong		error;
 
 	*value = 0;