MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Frazer Clement Date:October 27 2009 1:32pm
Subject:bzr commit into mysql-5.1-telco-6.2 branch (frazer:3034) Bug#46955
View as plain text  
#At file:///home/frazer/bzr/mysql-5.1-telco-6.2/

 3034 Frazer Clement	2009-10-27
      Bug#46955 : Extend fix to libmysqld
      modified:
        libmysqld/lib_sql.cc
        mysql-test/include/have_multi_ndb.inc

=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2009-07-29 20:07:08 +0000
+++ b/libmysqld/lib_sql.cc	2009-10-27 13:32:00 +0000
@@ -566,6 +566,29 @@ int init_embedded_server(int argc, char 
   }
 
   execute_ddl_log_recovery();
+  
+  /* Signal successful initialization */
+  pthread_mutex_lock(&LOCK_server_started);
+  mysqld_server_started= 1;
+  pthread_cond_signal(&COND_server_started);
+  pthread_mutex_unlock(&LOCK_server_started);
+  
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
+  /* 
+     Give ndb opportunity to initialise more things after
+     mysqld_server_started is true
+  */
+  if (ndb_wait_setup_func)
+  {
+    if (ndb_wait_setup_func(opt_ndb_wait_setup))
+    {
+      fprintf(stderr, "NDB : Tables not available after %lu seconds."
+              "  Consider increasing --ndb-wait-setup value",
+              opt_ndb_wait_setup);
+    }
+  }
+#endif
+  
   return 0;
 }
 

=== modified file 'mysql-test/include/have_multi_ndb.inc'
--- a/mysql-test/include/have_multi_ndb.inc	2009-10-23 17:49:51 +0000
+++ b/mysql-test/include/have_multi_ndb.inc	2009-10-27 13:32:00 +0000
@@ -21,12 +21,6 @@ if (`SELECT 1 FROM dual WHERE '$engines_
 {
 --require r/true.require
 SELECT (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') as `TRUE` FROM information_schema.engines WHERE engine = 'ndbcluster';
-if ($have_embedded)
-{
-  # Embedded server does not have 'wait_setup' mechanism
-  # so must use script to wait till it's started up
-  --source include/ndb_not_readonly.inc
-}
 }
 enable_query_log;
 

Thread
bzr commit into mysql-5.1-telco-6.2 branch (frazer:3034) Bug#46955Frazer Clement27 Oct