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

[Magnus Blåudd]

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

 4260 Magnus Blåudd	2011-03-23
      ndb dist priv test
       - remove disable/enable warnings wournd the exection of the script
         that loads the procedures

    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:40:46 +0000
+++ b/mysql-test/suite/ndb/t/ndb_distribute_user.test	2011-03-23 12:45:32 +0000
@@ -4,24 +4,20 @@
 let $load_sql_file = $MYSQL_TEST_DIR/../scripts/mysql_load_distribute_privilege_procedures.sql;
 
 connection server1;
---disable_warnings
 --disable_query_log
 --disable_result_log
 --exec $MYSQL < $load_sql_file
 call mysql.mysql_cluster_backup_privileges();
  --enable_result_log
  --enable_query_log
- --enable_warnings
 
 connection server2;
---disable_warnings
 --disable_query_log
 --disable_result_log
 --exec $MYSQL --defaults-group-suffix=.2.1 < $load_sql_file
 call mysql.mysql_cluster_backup_privileges();
  --enable_result_log
  --enable_query_log
- --enable_warnings
 
 connection server1;
 call mysql.mysql_cluster_move_privileges();

=== 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:40:46 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_distribute_user.test	2011-03-23 12:45:32 +0000
@@ -6,24 +6,20 @@
 let $load_sql_file = $MYSQL_TEST_DIR/../scripts/mysql_load_distribute_privilege_procedures.sql;
 
 connection server1;
---disable_warnings
 --disable_query_log
 --disable_result_log
 --exec $MYSQL < $load_sql_file
 call mysql.mysql_cluster_backup_privileges();
  --enable_result_log
  --enable_query_log
- --enable_warnings
 
 connection server2;
---disable_warnings
 --disable_query_log
 --disable_result_log
 --exec $MYSQL --defaults-group-suffix=.2.1 < $load_sql_file
 call mysql.mysql_cluster_backup_privileges();
  --enable_result_log
  --enable_query_log
- --enable_warnings
 
 connection server1;
 call mysql.mysql_cluster_move_privileges();

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