Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge

mysql-test/r/ndb_bug26793.result

@@ -3,7 +3,11 @@ 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;

mysql-test/t/ndb_bug26793.test

@@ -9,6 +9,7 @@ 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;
@@ -31,3 +32,7 @@ enable_result_log;
 connect (root,localhost,root,,test);
 connection root;
 DROP TABLE `test`.`test`;
+insert into mysql.db select * from test.db_temp;
+drop table db_temp;
+flush privileges;
+