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); }
Yet another regression introduced by backporting for bug 1319904.
This patch fixes the issue.
diff --git a/sql/mysqld.cc b/sql/mysqld.cc thread_ in_use= 0; // Allow 'kill' to work lock(&LOCK_ server_ started) ; server_ started= 1; broadcast( &COND_server_ started) ; unlock( &LOCK_server_ started) ; mysql_stdin) ; abort(bootstrap _error ? 1 : 0);
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_
+ /* Signal threads waiting for server to be started */
+ mysql_mutex_
+ mysqld_
+ mysql_cond_
+ mysql_mutex_
bootstrap(
unireg_
}