bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3239)

[Magnus Blåudd]

#At file:///C:/mysql/5.5-cluster/ based on revid:magnus.blaudd@stripped

 3239 Magnus Blåudd	2011-03-09
      ndb
       - make sure ndbcluster_global_schema_lock_deinit is always called before returning from failed ndbcluster_init
       - call ndbcluster_global_schema_lock_deinit before ndb_end_internal when shutting down

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-03-08 23:34:06 +0000
+++ b/sql/ha_ndbcluster.cc	2011-03-09 08:14:40 +0000
@@ -10668,7 +10668,6 @@ static int ndbcluster_init(void *p)
     pthread_cond_destroy(&COND_ndb_util_thread);
     pthread_cond_destroy(&COND_ndb_util_ready);
     pthread_cond_destroy(&COND_ndb_setup_complete);
-    ndbcluster_global_schema_lock_deinit();
     goto ndbcluster_init_error;
   }
 
@@ -10687,7 +10686,6 @@ static int ndbcluster_init(void *p)
     pthread_cond_destroy(&COND_ndb_util_thread);
     pthread_cond_destroy(&COND_ndb_util_ready);
     pthread_cond_destroy(&COND_ndb_setup_complete);
-    ndbcluster_global_schema_lock_deinit();
     goto ndbcluster_init_error;
   }
 
@@ -10705,6 +10703,8 @@ ndbcluster_init_error:
   ndbcluster_disconnect();
   ndbcluster_hton->state= SHOW_OPTION_DISABLED;               // If we couldn't use handler
 
+  ndbcluster_global_schema_lock_deinit();
+
   DBUG_RETURN(TRUE);
 }
 
@@ -10739,6 +10739,8 @@ static int ndbcluster_end(handlerton *ht
 
   ndbcluster_disconnect();
 
+  ndbcluster_global_schema_lock_deinit();
+
   // cleanup ndb interface
   ndb_end_internal();
 
@@ -10747,7 +10749,6 @@ static int ndbcluster_end(handlerton *ht
   pthread_cond_destroy(&COND_ndb_util_thread);
   pthread_cond_destroy(&COND_ndb_util_ready);
   pthread_cond_destroy(&COND_ndb_setup_complete);
-  ndbcluster_global_schema_lock_deinit();
   DBUG_RETURN(0);
 }
 

Attachment: [text/bzr-bundle] bzr/[e-mail]