Merge perch.ndb.mysql.com:/home/jonas/src/50-bug28804

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb

mysql-test/r/ndb_bug26793.result

@@ -3,11 +3,6 @@ CREATE TABLE `test` (
 `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
 `t` VARCHAR( 10 ) NOT NULL
 ) ENGINE = ndbcluster;
-create table test.db_temp as select * from mysql.db where user='';
-delete from mysql.db where user='';
-flush privileges;
 GRANT USAGE ON *.* TO user1@localhost IDENTIFIED BY 'pass';
 DROP TABLE `test`.`test`;
-insert into mysql.db select * from test.db_temp;
-drop table db_temp;
-flush privileges;
+drop user user1@localhost;

mysql-test/t/ndb_bug26793.test

@@ -9,15 +9,12 @@ CREATE TABLE `test` (
 `t` VARCHAR( 10 ) NOT NULL
 ) ENGINE = ndbcluster;
 
-create table test.db_temp as select * from mysql.db where user='';
-delete from mysql.db where user='';
-
-flush privileges;
-
+# Add user1@localhost with a specific password
+# and connect as that user
 GRANT USAGE ON *.* TO user1@localhost IDENTIFIED BY 'pass';
-
 connect (user1,localhost,user1,pass,*NO-ONE*);
 
+# Run the query 100 times
 disable_query_log;
 disable_result_log;
 let $i= 100;
@@ -29,10 +26,10 @@ dec $i;
 enable_query_log;
 enable_result_log;
 
-connect (root,localhost,root,,test);
-connection root;
+disconnect user1;
+
+# Switch back to the default connection and cleanup
+connection default;
 DROP TABLE `test`.`test`;
-insert into mysql.db select * from test.db_temp;
-drop table db_temp;
-flush privileges;
+drop user user1@localhost;