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

[Magnus Blåudd]

#At file:///data0/magnus/mysql/7.0-dist-priv/ based on revid:magnus.blaudd@stripped

 4257 Magnus Blåudd	2011-03-23
      ndb - remove junk from dist priv test files

    modified:
      mysql-test/suite/ndb/t/ndb_distribute_user.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_distribute_user.test
=== modified file 'mysql-test/suite/ndb/t/ndb_distribute_user.test'
--- a/mysql-test/suite/ndb/t/ndb_distribute_user.test	2011-03-23 12:06:50 +0000
+++ b/mysql-test/suite/ndb/t/ndb_distribute_user.test	2011-03-23 12:25:39 +0000
@@ -61,51 +61,6 @@ DROP USER 'newuser'@'localhost';
 DROP USER 'user2'@'localhost';
 DROP USER 'user3'@'localhost';
 
-#--disable_warnings
-#--disable_query_log
-#--disable_result_log
-#--exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "all restart -I" >> $NDB_TOOLS_OUTPUT
-#--exec $NDB_WAITER --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" >> $NDB_TOOLS_OUTPUT
-#--enable_result_log
-#--enable_query_log
-#--enable_warnings
-
-#connection server1;
-#--echo Restarting first mysqld without privileges
-#--disable_warnings
-#--disable_query_log
-#--disable_result_log
-#let $mysqld_options=--skip-grant-tables
-#let $mysqld_name=mysqld.1.1;
-#--source include/restart_mysqld.inc
-#--enable_result_log
-#--enable_query_log
-#--enable_warnings
-
-#connection server1;
-#call mysql.mysql_cluster_restore_privileges();
-
-#--echo Restarting first mysqld again with privileges
-#--disable_warnings
-#--disable_query_log
-#--disable_result_log
-#let $mysqld_name=mysqld.1.1;
-#--source include/restart_mysqld.inc
-#--enable_result_log
-#--enable_query_log
-#--enable_warnings
-
-#connection server1;
-#call mysql.mysql_cluster_move_grant_tables();
-
-#select distinct User,Password from mysql.user order by User;
-
-#--echo Restarting second mysqld
-#let $mysqld_name=mysqld.2.1;
-#--source include/restart_mysqld.inc
-
-#connection server2;
-#select distinct User,Password from mysql.user order by User;
 
 # Restore local privileges
 connection server1;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_distribute_user.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_distribute_user.test	2011-03-23 12:06:50 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_distribute_user.test	2011-03-23 12:25:39 +0000
@@ -81,53 +81,6 @@ sync_slave_with_master;
 
 STOP SLAVE;
 
-#call mtr.add_suppression("NDB Binlog: cluster has been restarted --initial");
-#--disable_warnings
-#--disable_query_log
-#--disable_result_log
-#--exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "all restart -I" >> $NDB_TOOLS_OUTPUT
-#--exec $NDB_WAITER --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" >> $NDB_TOOLS_OUTPUT
-#--enable_result_log
-#--enable_query_log
-#--enable_warnings
-
-#connection server1;
-#--echo Restarting first mysqld without privileges
-#--disable_warnings
-#--disable_query_log
-#--disable_result_log
-#let $mysqld_options=--skip-grant-tables
-#let $mysqld_name=mysqld.1.1;
-#--source include/restart_mysqld.inc
-#--enable_result_log
-#--enable_query_log
-#--enable_warnings
-
-#connection server1;
-#call mysql.mysql_cluster_restore_privileges();
-
-#--echo Restarting first mysqld again with privileges
-#--disable_warnings
-#--disable_query_log
-#--disable_result_log
-#let $mysqld_name=mysqld.1.1;
-#--source include/restart_mysqld.inc
-#--enable_result_log
-#--enable_query_log
-#--enable_warnings
-
-#connection server1;
-#call mysql.mysql_cluster_move_grant_tables();
-
-#select distinct User,Password from mysql.user order by User;
-
-#--echo Restarting second mysqld
-#let $mysqld_name=mysqld.2.1;
-#--source include/restart_mysqld.inc
-
-#connection server2;
-#select distinct User,Password from mysql.user order by User;
-
 # Restore local privileges
 connection server1;
 call mysql.mysql_cluster_backup_privileges();

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