Merge mysql.com:/home/ram/work/mysql-5.0-maint

into  mysql.com:/home/ram/work/mysql-5.1-maint


mysql-test/r/grant.result:
  Auto merged
mysql-test/r/type_datetime.result:
  manual merge.
mysql-test/t/type_datetime.test:
  manual merge.

mysql-test/r/type_datetime.result

@@ -441,13 +441,6 @@ insert into t1 values (), (), ();
 select sum(a) from t1 group by convert(a, datetime);
 sum(a)
 NULL
-select convert(a, datetime) from t1;
-Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					convert(a, datetime)	12	29	0	Y	128	6	63
-convert(a, datetime)
-NULL
-NULL
-NULL
 drop table t1;
 End of 5.0 tests
 set @org_mode=@@sql_mode;

mysql-test/t/type_datetime.test

@@ -299,9 +299,6 @@ drop table t1;
 create table t1 (a tinyint);
 insert into t1 values (), (), ();
 select sum(a) from t1 group by convert(a, datetime);
---enable_metadata
-select convert(a, datetime) from t1;
---disable_metadata
 drop table t1;
 
 --echo End of 5.0 tests