Merge ndbdev@ndbmaster.mysql.com:jonas/mysql-5.1-new

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

sql/ha_ndbcluster_binlog.cc

@@ -765,25 +765,28 @@ static int ndbcluster_create_schema_table(THD *thd)
 void ndbcluster_setup_binlog_table_shares(THD *thd)
 {
   int done_find_all_files= 0;
-  if (!apply_status_share &&
-      ndbcluster_check_apply_status_share() == 0)
+  if (!schema_share &&
+      ndbcluster_check_schema_share() == 0)
   {
     if (!done_find_all_files)
     {
       ndbcluster_find_all_files(thd);
       done_find_all_files= 1;
     }
-    ndbcluster_create_apply_status_table(thd);
+    ndbcluster_create_schema_table(thd);
+    // always make sure we create the 'schema' first
+    if (!schema_share)
+      return;
   }
-  if (!schema_share &&
-      ndbcluster_check_schema_share() == 0)
+  if (!apply_status_share &&
+      ndbcluster_check_apply_status_share() == 0)
   {
     if (!done_find_all_files)
     {
       ndbcluster_find_all_files(thd);
       done_find_all_files= 1;
     }
-    ndbcluster_create_schema_table(thd);
+    ndbcluster_create_apply_status_table(thd);
   }
 }
 

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

@@ -1303,7 +1303,7 @@ NdbDictionaryImpl::fetchGlobalTableImpl(const BaseString& internalTableName)
       int ret = getBlobTables(*impl);
       if (ret != 0) {
         delete impl;
-        return 0;
+        impl = 0;
       }
     }