List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:March 23 2011 1:06pm
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4261)
View as plain text  
#At file:///data0/magnus/mysql/7.0-dist-priv/ based on revid:magnus.blaudd@strippedis8

 4261 Magnus Blåudd	2011-03-23
      ndb dist priv test
       - run cleanup without disable_warnings  to catch errors
       - run cleanup without IF EXISTS to catch missing tables, procs or functions
         directly, itäs well known what should exist and where

    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:45:32 +0000
+++ b/mysql-test/suite/ndb/t/ndb_distribute_user.test	2011-03-23 13:05:27 +0000
@@ -71,60 +71,58 @@ connection server2;
 call mysql.mysql_cluster_restore_local_privileges();
 
 
-connection server1;
-
---disable_warnings
 --disable_query_log
 --disable_result_log
-drop table if exists mysql.user_backup;
-drop table if exists mysql.db_backup;
-drop table if exists mysql.tables_priv_backup;
-drop table if exists mysql.columns_priv_backup;
-drop table if exists mysql.procs_priv_backup;
-drop table if exists mysql.host_backup;
-drop table if exists mysql.ndb_user_backup;
-drop table if exists mysql.ndb_db_backup;
-drop table if exists mysql.ndb_tables_priv_backup;
-drop table if exists mysql.ndb_columns_priv_backup;
-drop table if exists mysql.ndb_procs_priv_backup;
-drop table if exists mysql.ndb_host_backup;
-drop function if exists mysql.mysql_cluster_privileges_are_distributed;
-drop procedure if exists mysql.mysql_cluster_backup_privileges;
-drop procedure if exists mysql.mysql_cluster_move_grant_tables;
-drop procedure if exists mysql.mysql_cluster_drop_grant_tables;
-drop procedure if exists mysql.mysql_cluster_restore_local_privileges;
-drop procedure if exists mysql.mysql_cluster_restore_privileges;
-drop procedure if exists mysql.mysql_cluster_restore_privileges_from_local;
-drop procedure if exists mysql.mysql_cluster_move_privileges;
- --enable_result_log
- --enable_query_log
- --enable_warnings
+
+connection server1;
+
+# Drop the local backup tables
+drop table mysql.user_backup;
+drop table mysql.db_backup;
+drop table mysql.tables_priv_backup;
+drop table mysql.columns_priv_backup;
+drop table mysql.procs_priv_backup;
+drop table mysql.host_backup;
+
+# Drop the distributed backup tables
+drop table mysql.ndb_user_backup;
+drop table mysql.ndb_db_backup;
+drop table mysql.ndb_tables_priv_backup;
+drop table mysql.ndb_columns_priv_backup;
+drop table mysql.ndb_procs_priv_backup;
+drop table mysql.ndb_host_backup;
+
+# Drop the function and sprocs
+drop function mysql.mysql_cluster_privileges_are_distributed;
+drop procedure mysql.mysql_cluster_backup_privileges;
+drop procedure mysql.mysql_cluster_move_grant_tables;
+drop procedure mysql.mysql_cluster_restore_local_privileges;
+drop procedure mysql.mysql_cluster_restore_privileges;
+drop procedure mysql.mysql_cluster_restore_privileges_from_local;
+drop procedure mysql.mysql_cluster_move_privileges;
 
 connection server2;
 
---disable_warnings
---disable_query_log
---disable_result_log
-drop table if exists mysql.user_backup;
-drop table if exists mysql.db_backup;
-drop table if exists mysql.tables_priv_backup;
-drop table if exists mysql.columns_priv_backup;
-drop table if exists mysql.procs_priv_backup;
-drop table if exists mysql.host_backup;
-drop table if exists mysql.ndb_user_backup;
-drop table if exists mysql.ndb_db_backup;
-drop table if exists mysql.ndb_tables_priv_backup;
-drop table if exists mysql.ndb_columns_priv_backup;
-drop table if exists mysql.ndb_procs_priv_backup;
-drop table if exists mysql.ndb_host_backup;
-drop function if exists mysql.mysql_cluster_privileges_are_distributed;
-drop procedure if exists mysql.mysql_cluster_backup_privileges;
-drop procedure if exists mysql.mysql_cluster_move_grant_tables;
-drop procedure if exists mysql.mysql_cluster_drop_grant_tables;
-drop procedure if exists mysql.mysql_cluster_restore_local_privileges;
-drop procedure if exists mysql.mysql_cluster_restore_privileges;
-drop procedure if exists mysql.mysql_cluster_restore_privileges_from_local;
-drop procedure if exists mysql.mysql_cluster_move_privileges;
- --enable_result_log
- --enable_query_log
- --enable_warnings
+# Drop the local backup tables
+drop table mysql.user_backup;
+drop table mysql.db_backup;
+drop table mysql.tables_priv_backup;
+drop table mysql.columns_priv_backup;
+drop table mysql.procs_priv_backup;
+drop table mysql.host_backup;
+
+# The distributed backup tables should already have been dropped
+--error ER_NO_SUCH_TABLE
+select * from mysql.ndb_user_backup;
+
+# Drop the function and sprocs
+drop function mysql.mysql_cluster_privileges_are_distributed;
+drop procedure mysql.mysql_cluster_backup_privileges;
+drop procedure mysql.mysql_cluster_move_grant_tables;
+drop procedure mysql.mysql_cluster_restore_local_privileges;
+drop procedure mysql.mysql_cluster_restore_privileges;
+drop procedure mysql.mysql_cluster_restore_privileges_from_local;
+drop procedure mysql.mysql_cluster_move_privileges;
+
+--enable_result_log
+--enable_query_log

=== 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:45:32 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_distribute_user.test	2011-03-23 13:05:27 +0000
@@ -94,90 +94,87 @@ call mysql.mysql_cluster_restore_local_p
 connection slave;
 call mysql.mysql_cluster_restore_local_privileges();
 
-connection server1;
 
---disable_warnings
 --disable_query_log
 --disable_result_log
-drop table if exists mysql.user_backup;
-drop table if exists mysql.db_backup;
-drop table if exists mysql.tables_priv_backup;
-drop table if exists mysql.columns_priv_backup;
-drop table if exists mysql.procs_priv_backup;
-drop table if exists mysql.host_backup;
-drop table if exists mysql.ndb_user_backup;
-drop table if exists mysql.ndb_db_backup;
-drop table if exists mysql.ndb_tables_priv_backup;
-drop table if exists mysql.ndb_columns_priv_backup;
-drop table if exists mysql.ndb_procs_priv_backup;
-drop table if exists mysql.ndb_host_backup;
-drop function if exists mysql.mysql_cluster_privileges_are_distributed;
-drop procedure if exists mysql.mysql_cluster_backup_privileges;
-drop procedure if exists mysql.mysql_cluster_move_grant_tables;
-drop procedure if exists mysql.mysql_cluster_drop_grant_tables;
-drop procedure if exists mysql.mysql_cluster_restore_local_privileges;
-drop procedure if exists mysql.mysql_cluster_restore_privileges;
-drop procedure if exists mysql.mysql_cluster_restore_privileges_from_local;
-drop procedure if exists mysql.mysql_cluster_move_privileges;
- --enable_result_log
- --enable_query_log
- --enable_warnings
 
-connection server2;
+connection server1;
 
---disable_warnings
---disable_query_log
---disable_result_log
-drop table if exists mysql.user_backup;
-drop table if exists mysql.db_backup;
-drop table if exists mysql.tables_priv_backup;
-drop table if exists mysql.columns_priv_backup;
-drop table if exists mysql.procs_priv_backup;
-drop table if exists mysql.host_backup;
-drop table if exists mysql.ndb_user_backup;
-drop table if exists mysql.ndb_db_backup;
-drop table if exists mysql.ndb_tables_priv_backup;
-drop table if exists mysql.ndb_columns_priv_backup;
-drop table if exists mysql.ndb_procs_priv_backup;
-drop table if exists mysql.ndb_host_backup;
-drop function if exists mysql.mysql_cluster_privileges_are_distributed;
-drop procedure if exists mysql.mysql_cluster_backup_privileges;
-drop procedure if exists mysql.mysql_cluster_move_grant_tables;
-drop procedure if exists mysql.mysql_cluster_drop_grant_tables;
-drop procedure if exists mysql.mysql_cluster_restore_local_privileges;
-drop procedure if exists mysql.mysql_cluster_restore_privileges;
-drop procedure if exists mysql.mysql_cluster_restore_privileges_from_local;
-drop procedure if exists mysql.mysql_cluster_move_privileges;
- --enable_result_log
- --enable_query_log
- --enable_warnings
+# Drop the local backup tables
+drop table mysql.user_backup;
+drop table mysql.db_backup;
+drop table mysql.tables_priv_backup;
+drop table mysql.columns_priv_backup;
+drop table mysql.procs_priv_backup;
+drop table mysql.host_backup;
+
+# Drop the distributed backup tables
+drop table mysql.ndb_user_backup;
+drop table mysql.ndb_db_backup;
+drop table mysql.ndb_tables_priv_backup;
+drop table mysql.ndb_columns_priv_backup;
+drop table mysql.ndb_procs_priv_backup;
+drop table mysql.ndb_host_backup;
+
+# Drop the function and sprocs
+drop function mysql.mysql_cluster_privileges_are_distributed;
+drop procedure mysql.mysql_cluster_backup_privileges;
+drop procedure mysql.mysql_cluster_move_grant_tables;
+drop procedure mysql.mysql_cluster_restore_local_privileges;
+drop procedure mysql.mysql_cluster_restore_privileges;
+drop procedure mysql.mysql_cluster_restore_privileges_from_local;
+drop procedure mysql.mysql_cluster_move_privileges;
 
+connection server2;
+
+# Drop the local backup tables
+drop table mysql.user_backup;
+drop table mysql.db_backup;
+drop table mysql.tables_priv_backup;
+drop table mysql.columns_priv_backup;
+drop table mysql.procs_priv_backup;
+drop table mysql.host_backup;
+
+# The distributed backup tables should already have been dropped
+--error ER_NO_SUCH_TABLE
+select * from mysql.ndb_user_backup;
+
+# Drop the function and sprocs
+drop function mysql.mysql_cluster_privileges_are_distributed;
+drop procedure mysql.mysql_cluster_backup_privileges;
+drop procedure mysql.mysql_cluster_move_grant_tables;
+drop procedure mysql.mysql_cluster_restore_local_privileges;
+drop procedure mysql.mysql_cluster_restore_privileges;
+drop procedure mysql.mysql_cluster_restore_privileges_from_local;
+drop procedure mysql.mysql_cluster_move_privileges;
 
 connection slave;
 
---disable_warnings
---disable_query_log
---disable_result_log
-drop table if exists mysql.user_backup;
-drop table if exists mysql.db_backup;
-drop table if exists mysql.tables_priv_backup;
-drop table if exists mysql.columns_priv_backup;
-drop table if exists mysql.procs_priv_backup;
-drop table if exists mysql.host_backup;
-drop table if exists mysql.ndb_user_backup;
-drop table if exists mysql.ndb_db_backup;
-drop table if exists mysql.ndb_tables_priv_backup;
-drop table if exists mysql.ndb_columns_priv_backup;
-drop table if exists mysql.ndb_procs_priv_backup;
-drop table if exists mysql.ndb_host_backup;
-drop function if exists mysql.mysql_cluster_privileges_are_distributed;
-drop procedure if exists mysql.mysql_cluster_backup_privileges;
-drop procedure if exists mysql.mysql_cluster_move_grant_tables;
-drop procedure if exists mysql.mysql_cluster_drop_grant_tables;
-drop procedure if exists mysql.mysql_cluster_restore_local_privileges;
-drop procedure if exists mysql.mysql_cluster_restore_privileges;
-drop procedure if exists mysql.mysql_cluster_restore_privileges_from_local;
-drop procedure if exists mysql.mysql_cluster_move_privileges;
- --enable_result_log
- --enable_query_log
- --enable_warnings
+# Drop the local backup tables
+drop table mysql.user_backup;
+drop table mysql.db_backup;
+drop table mysql.tables_priv_backup;
+drop table mysql.columns_priv_backup;
+drop table mysql.procs_priv_backup;
+drop table mysql.host_backup;
+
+# Drop the distributed backup tables(slave is stopped they
+# should still be there)
+drop table mysql.ndb_user_backup;
+drop table mysql.ndb_db_backup;
+drop table mysql.ndb_tables_priv_backup;
+drop table mysql.ndb_columns_priv_backup;
+drop table mysql.ndb_procs_priv_backup;
+drop table mysql.ndb_host_backup;
+
+# Drop the function and sprocs
+drop function mysql.mysql_cluster_privileges_are_distributed;
+drop procedure mysql.mysql_cluster_backup_privileges;
+drop procedure mysql.mysql_cluster_move_grant_tables;
+drop procedure mysql.mysql_cluster_restore_local_privileges;
+drop procedure mysql.mysql_cluster_restore_privileges;
+drop procedure mysql.mysql_cluster_restore_privileges_from_local;
+drop procedure mysql.mysql_cluster_move_privileges;
+
+--enable_query_log
+--enable_result_log

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110323130527-35gnsnj63vn6g10g.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4261) Magnus Blåudd23 Mar