Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/information_schema.test:
  manual merge

mysql-test/r/information_schema.result

@@ -1470,10 +1470,10 @@ f7	datetime	NO		NULL
 f8	datetime	YES		2006-01-01 00:00:00	
 drop table t1;
 End of 5.0 tests.
-show fields from information_schema.TABLE_NAMES;
-ERROR 42S02: Unknown table 'TABLE_NAMES' in information_schema
-show keys from information_schema.TABLE_NAMES;
-ERROR 42S02: Unknown table 'TABLE_NAMES' in information_schema
+show fields from information_schema.table_names;
+ERROR 42S02: Unknown table 'table_names' in information_schema
+show keys from information_schema.table_names;
+ERROR 42S02: Unknown table 'table_names' in information_schema
 select * from information_schema.engines WHERE ENGINE="MyISAM";
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 MyISAM	DEFAULT	Default engine as of MySQL 3.23 with great performance	NO	NO	NO

mysql-test/t/information_schema.test

@@ -1095,10 +1095,9 @@ drop table t1;
 # Bug#30079 A check for "hidden" I_S tables is flawed
 #
 --error 1109
-show fields from information_schema.TABLE_NAMES;
+show fields from information_schema.table_names;
 --error 1109
-show keys from information_schema.TABLE_NAMES;
-
+show keys from information_schema.table_names;
 #
 # Show engines
 #