Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

sql/sql_yacc.yy

@@ -1168,28 +1168,28 @@ type:
 	| BLOB_SYM opt_len		{ Lex->charset=&my_charset_bin;
 					  $$=FIELD_TYPE_BLOB; }
 	| GEOMETRY_SYM			{ Lex->charset=&my_charset_bin;
-					  Lex->uint_geom_type= Field::GEOM_GEOMETRY;
+					  Lex->uint_geom_type= (uint) Field::GEOM_GEOMETRY;
 					  $$=FIELD_TYPE_GEOMETRY; }
 	| GEOMETRYCOLLECTION		{ Lex->charset=&my_charset_bin;
-					  Lex->uint_geom_type= Field::GEOM_GEOMETRYCOLLECTION;
+					  Lex->uint_geom_type= (uint) Field::GEOM_GEOMETRYCOLLECTION;
 					  $$=FIELD_TYPE_GEOMETRY; }
 	| POINT_SYM			{ Lex->charset=&my_charset_bin;
-					  Lex->uint_geom_type= Field::GEOM_POINT;
+					  Lex->uint_geom_type= (uint) Field::GEOM_POINT;
 					  $$=FIELD_TYPE_GEOMETRY; }
 	| MULTIPOINT			{ Lex->charset=&my_charset_bin;
-					  Lex->uint_geom_type= Field::GEOM_MULTIPOINT;
+					  Lex->uint_geom_type= (uint) Field::GEOM_MULTIPOINT;
 					  $$=FIELD_TYPE_GEOMETRY; }
 	| LINESTRING			{ Lex->charset=&my_charset_bin;
-					  Lex->uint_geom_type= Field::GEOM_LINESTRING;
+					  Lex->uint_geom_type= (uint) Field::GEOM_LINESTRING;
 					  $$=FIELD_TYPE_GEOMETRY; }
 	| MULTILINESTRING		{ Lex->charset=&my_charset_bin;
-					  Lex->uint_geom_type= Field::GEOM_MULTILINESTRING;
+					  Lex->uint_geom_type= (uint) Field::GEOM_MULTILINESTRING;
 					  $$=FIELD_TYPE_GEOMETRY; }
 	| POLYGON			{ Lex->charset=&my_charset_bin;
-					  Lex->uint_geom_type= Field::GEOM_POLYGON;
+					  Lex->uint_geom_type= (uint) Field::GEOM_POLYGON;
 					  $$=FIELD_TYPE_GEOMETRY; }
 	| MULTIPOLYGON			{ Lex->charset=&my_charset_bin;
-					  Lex->uint_geom_type= Field::GEOM_MULTIPOLYGON;
+					  Lex->uint_geom_type= (uint) Field::GEOM_MULTIPOLYGON;
 					  $$=FIELD_TYPE_GEOMETRY; }
 	| MEDIUMBLOB			{ Lex->charset=&my_charset_bin;
 					  $$=FIELD_TYPE_MEDIUM_BLOB; }