bk commit into 5.0 tree (mleich:1.2489) BUG#30418

[mleich]

Below is the list of changes that have just been committed into a local
5.0 repository of mleich. When mleich 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, 2007-08-24 14:40:47+02:00, mleich@stripped +1 -0
  Fix for
      Bug#30418 "datadict" tests (all engines) fail: Dependency on the host name for ordering
  Attention: This is not the final changeset, so please ignore the bk commit email.

  mysql-test/suite/funcs_1/datadict/datadict_master.inc@stripped, 2007-08-24 14:39:32+02:00, mleich@stripped +12 -0
    Insert "--sorted_result" at various places.

diff -Nrup a/mysql-test/suite/funcs_1/datadict/datadict_master.inc b/mysql-test/suite/funcs_1/datadict/datadict_master.inc
--- a/mysql-test/suite/funcs_1/datadict/datadict_master.inc	2007-07-25 06:31:21 +02:00
+++ b/mysql-test/suite/funcs_1/datadict/datadict_master.inc	2007-08-24 14:39:32 +02:00
@@ -18,6 +18,12 @@ let $message=
 .;
 --source include/show_msg80.inc
 
+# Last change:
+# 2007-08-24 mleich  1. Fix for Bug
+#                       Bug#30418 "datadict" tests (all engines) fail:
+#                                 Dependency on the host name for ordering
+#                       by inserting "--sorted_result" before the critical
+#                       statements.
 ################################################################################
 #
    let $message= FIXME: There are subtests that are switched off due to known bugs:;
@@ -105,6 +111,7 @@ SELECT DISTINCT u,
     AS Server_Clean
 FROM db_datadict.vu1;
 --replace_result $SERVER_NAME <SERVER_NAME>
+--sorted_result
 SELECT * FROM db_datadict.vu order by u;
 
 delimiter //;
@@ -178,6 +185,7 @@ select * from routines;
 select count(*) from routines;
 select * from statistics;
 select * from views;
+--sorted_result
 --replace_result $SERVER_NAME <SERVER_NAME>
 select * from user_privileges order by grantee, privilege_type;
 select * from schema_privileges;
@@ -198,6 +206,7 @@ select concat("Table or view '", table_n
               "' is associated with the database '", table_schema, "'.") as "Who is Who"
   from tables;
 
+--sorted_result
 --replace_result $SERVER_NAME <SERVER_NAME>
 select grantee as "user's having select privilege",
        substring( grantee, length(SUBSTRING_INDEX(grantee,_utf8'@',1))+2 )
@@ -389,6 +398,7 @@ select concat(table_schema, ', ', table_
 select concat(table_schema, ', ', table_name) "Table_info"
   from tables ORDER BY 1;
 
+--sorted_result
 --replace_result $SERVER_NAME <SERVER_NAME>
 select distinct grantee from user_privileges order by grantee, privilege_type;
 select * from schema_privileges where table_catalog is null limit 0, 5;
@@ -401,8 +411,10 @@ select sum(ordinal_position) from key_co
 
 select * from schemata limit 0,5;
 select * from schemata  limit 0,5;
+--sorted_result
 --replace_result $SERVER_NAME <SERVER_NAME>
 select distinct grantee from user_privileges;
+--sorted_result
 --replace_result $SERVER_NAME <SERVER_NAME>
 select all      grantee from user_privileges order by grantee, privilege_type;