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

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


sql/ha_ndbcluster.cc:
  Auto merged

mysql-test/r/ndb_bug26793.result

+DROP TABLE IF EXISTS t1;
+CREATE TABLE `test` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`t` VARCHAR( 10 ) NOT NULL
+) ENGINE = ndbcluster;
+delete from mysql.db where user='';
+flush privileges;
+GRANT USAGE ON *.* TO user1@localhost IDENTIFIED BY 'pass';
+DROP TABLE `test`.`test`;

mysql-test/t/ndb_bug26793.test

+-- source include/have_ndb.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TABLE `test` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`t` VARCHAR( 10 ) NOT NULL
+) ENGINE = ndbcluster;
+
+delete from mysql.db where user='';
+
+flush privileges;
+
+GRANT USAGE ON *.* TO user1@localhost IDENTIFIED BY 'pass';
+
+connect (user1,localhost,user1,pass,*NO-ONE*);
+
+disable_query_log;
+disable_result_log;
+let $i= 100;
+while ($i)
+{
+select count(*) from information_schema.tables union all select count(*) from information_schema.tables union all select count(*) from information_schema.tables;
+dec $i;
+}
+enable_query_log;
+enable_result_log;
+
+connect (root,localhost,root,,test);
+connection root;
+DROP TABLE `test`.`test`;

sql/ha_ndbcluster.cc

@@ -3980,6 +3980,8 @@ int ha_ndbcluster::info(uint flag)
     DBUG_PRINT("info", ("HA_STATUS_AUTO"));
     if (m_table && table->found_next_number_field)
     {
+      if ((my_errno= check_ndb_connection()))
+        DBUG_RETURN(my_errno);
       Ndb *ndb= get_ndb();
       Ndb_tuple_id_range_guard g(m_share);