bk commit into 5.1 tree (msvensson:1.2570)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson 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-04-09 22:06:02+02:00, msvensson@stripped +1 -0
  Improve readability of check testcase data and add order by

  mysql-test/include/mtr_check.sql@stripped, 2008-04-09 22:06:00+02:00, msvensson@stripped +12 -4
    Improve readability of check testcase data and add order by

diff -Nrup a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql
--- a/mysql-test/include/mtr_check.sql	2008-04-09 14:38:40 +02:00
+++ b/mysql-test/include/mtr_check.sql	2008-04-09 22:06:00 +02:00
@@ -23,10 +23,18 @@ BEGIN
     WHERE table_schema='test';
 
   -- Show "mysql" database, tables and columns
-  SELECT table_name, table_type, engine FROM INFORMATION_SCHEMA.TABLES
-    WHERE table_schema='mysql';
-  SELECT * FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_schema='mysql';
+  SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql
+    FROM INFORMATION_SCHEMA.TABLES
+      WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'
+        ORDER BY tables_in_mysql;
+  SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql,
+  	 column_name, ordinal_position, column_default, is_nullable,
+         data_type, character_maximum_length, character_octet_length,
+         numeric_precision, numeric_scale, character_set_name,
+         collation_name, column_type, column_key, extra, column_comment
+    FROM INFORMATION_SCHEMA.COLUMNS
+      WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'
+        ORDER BY columns_in_mysql;
 
   -- Checksum system tables to make sure they have been properly
   -- restored after test