Comment 6 for bug 1402074

Revision history for this message
Sergei Glushchenko (sergei.glushchenko) wrote :

Yet another regression introduced by backporting for bug 1319904.
This patch fixes the issue.

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 6729bfc..c89fc6d 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4857,6 +4857,11 @@ int mysqld_main(int argc, char **argv)
   if (opt_bootstrap)
   {
     select_thread_in_use= 0; // Allow 'kill' to work
+ /* Signal threads waiting for server to be started */
+ mysql_mutex_lock(&LOCK_server_started);
+ mysqld_server_started= 1;
+ mysql_cond_broadcast(&COND_server_started);
+ mysql_mutex_unlock(&LOCK_server_started);
     bootstrap(mysql_stdin);
     unireg_abort(bootstrap_error ? 1 : 0);
   }