List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:March 29 2011 12:27pm
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4274)
View as plain text  
#At file:///home/msvensson/mysql/7.0-dist-priv/ based on revid:magnus.blaudd@strippedb0mth

 4274 Magnus Blåudd	2011-03-29
      ndb dist priv
       - cdrop created users to properly clean up before test ends

    modified:
      mysql-test/suite/ndb/r/ndb_dist_priv.result
      mysql-test/suite/ndb/t/ndb_dist_priv.test
=== modified file 'mysql-test/suite/ndb/r/ndb_dist_priv.result'
--- a/mysql-test/suite/ndb/r/ndb_dist_priv.result	2011-03-29 10:10:03 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dist_priv.result	2011-03-29 12:27:35 +0000
@@ -59,6 +59,7 @@ connect(127.0.0.1,billy1,,test,MASTER_PO
 ERROR 28000: Access denied for user 'billy1'@'localhost' (using password: NO)
 connect(127.0.0.1,billy1,wrongpass,test,MASTER_PORT1,MASTER_SOCKET);
 ERROR 28000: Access denied for user 'billy1'@'localhost' (using password: YES)
+DROP USER 'billy1'@'127.0.0.1';
 GRANT ALL ON *.* TO 'billy2'@'127.0.0.1';
 SELECT USER();
 USER()
@@ -66,6 +67,7 @@ billy2@localhost
 SELECT * FROM t1;
 pk
 1
+DROP USER 'billy2'@'127.0.0.1';
 === making backup of new users ===
 call mysql.mysql_cluster_backup_privileges();
 ==== clean up ====

=== modified file 'mysql-test/suite/ndb/t/ndb_dist_priv.test'
--- a/mysql-test/suite/ndb/t/ndb_dist_priv.test	2011-03-29 10:10:03 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dist_priv.test	2011-03-29 12:27:35 +0000
@@ -84,6 +84,9 @@ connect (server2_should_fail,127.0.0.1,b
 --error ER_ACCESS_DENIED_ERROR
 connect (server2_should_fail,127.0.0.1,billy1,wrongpass,test,$MASTER_MYPORT1,);
 
+connection server2;
+DROP USER 'billy1'@'127.0.0.1';
+
 #
 # Create a new user with GRANT ALL and check that it's possible
 # to connect as that user on second mysqld
@@ -96,6 +99,10 @@ connection server2_as_billy2;
 SELECT USER();
 SELECT * FROM t1;
 
+connection server2;
+DROP USER 'billy2'@'127.0.0.1';
+
+
 
 --echo === making backup of new users ===
 

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110329122735-47qk33mp8xb81wly.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4274) Magnus Blåudd29 Mar