bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3142)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@strippedf2ju3

 3142 Magnus Blåudd	2011-01-21
      ndb
       - add MCP patch for ndb_wait_setup also to libmysqld

    modified:
      libmysqld/lib_sql.cc
=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2010-11-16 12:37:26 +0000
+++ b/libmysqld/lib_sql.cc	2011-01-21 12:11:43 +0000
@@ -587,6 +587,17 @@ int init_embedded_server(int argc, char
   }
 
   execute_ddl_log_recovery();
+
+#ifndef MCP_BUG46955
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
+  if (ndb_wait_setup_func && ndb_wait_setup_func(opt_ndb_wait_setup))
+  {
+    sql_print_warning("NDB : Tables not available after %lu seconds."
+                      "  Consider increasing --ndb-wait-setup value",
+                      opt_ndb_wait_setup);
+  }
+#endif
+#endif
   return 0;
 }
 

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