bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4280)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0-dist-priv/ based on revid:magnus.blaudd@strippedtkc6c

 4280 Magnus Blåudd	2011-03-30
      ndb dist priv
       - Force restart since other tests depend on the _exact_
       order of rows in for example mysql.user

    modified:
      mysql-test/suite/ndb/t/ndb_dist_priv.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dist_priv.test
=== modified file 'mysql-test/suite/ndb/t/ndb_dist_priv.test'
--- a/mysql-test/suite/ndb/t/ndb_dist_priv.test	2011-03-29 12:27:35 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dist_priv.test	2011-03-30 15:08:53 +0000
@@ -181,5 +181,10 @@ drop procedure mysql.mysql_cluster_resto
 drop procedure mysql.mysql_cluster_restore_privileges_from_local;
 drop procedure mysql.mysql_cluster_move_privileges;
 
+# Force restart since other tests depend on the _exact_
+# order of rows in for example mysql.user
+call mtr.force_restart();
+
 --enable_result_log
 --enable_query_log
+

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_dist_priv.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_dist_priv.test	2011-03-30 15:02:52 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dist_priv.test	2011-03-30 15:08:53 +0000
@@ -208,5 +208,9 @@ drop procedure mysql.mysql_cluster_resto
 drop procedure mysql.mysql_cluster_restore_privileges_from_local;
 drop procedure mysql.mysql_cluster_move_privileges;
 
+# Force restart since other tests depend on the _exact_
+# order of rows in for example mysql.user
+call mtr.force_restart();
+
 --enable_query_log
 --enable_result_log

Attachment: [text/bzr-bundle] bzr/[e-mail]