bk commit into 5.0 tree (gshchepa:1.2603) BUG#34529

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.0 repository of gshchepa.  When gshchepa does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-25 19:44:27+04:00, gshchepa@stripped +2 -0
  information_schema.test, information_schema.result:
    Minor test case cleanup after bug#34529.

  mysql-test/r/information_schema.result@stripped, 2008-03-25 19:30:52+04:00, gshchepa@stripped +2 -1
    Minor test case cleanup after bug#34529.

  mysql-test/t/information_schema.test@stripped, 2008-03-25 19:43:31+04:00, gshchepa@stripped +4 -2
    Minor test case cleanup after bug#34529.

diff -Nrup a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result	2008-03-19 17:32:27 +04:00
+++ b/mysql-test/r/information_schema.result	2008-03-25 19:30:52 +04:00
@@ -1417,7 +1417,6 @@ select * from `information_schema`.`VIEW
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
 select * from `information_schema`.`VIEWS` where `TABLE_NAME` = NULL;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-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;
@@ -1432,3 +1431,5 @@ JOIN character_sets cs ON ( cs.character
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT	COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN	CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
 DROP TABLE test.t1;
 SET max_heap_table_size = DEFAULT;
+USE test;
+End of 5.0 tests.
diff -Nrup a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
--- a/mysql-test/t/information_schema.test	2008-03-19 17:32:27 +04:00
+++ b/mysql-test/t/information_schema.test	2008-03-25 19:43:31 +04:00
@@ -1108,8 +1108,6 @@ select * from `information_schema`.`TRIG
 select * from `information_schema`.`VIEWS` where `TABLE_SCHEMA` = NULL;
 select * from `information_schema`.`VIEWS` where `TABLE_NAME` = NULL;
 
---echo End of 5.0 tests.
-
 #
 # Bug#30079 A check for "hidden" I_S tables is flawed
 #
@@ -1139,3 +1137,7 @@ JOIN character_sets cs ON ( cs.character
 
 DROP TABLE test.t1;
 SET max_heap_table_size = DEFAULT;
+USE test;
+
+--echo End of 5.0 tests.
+