diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-02-10 00:20:23 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-02-10 00:20:23 +0100 |
| commit | b436db98fe123f4b0c83df3532881b038f7d9a9d (patch) | |
| tree | aa048f548d9037bd3eca6df0d415a8dd314e0ac8 /sql/mysqld.cc | |
| parent | b3093073b1ec076ad7ef5ef8b8fca9022864a890 (diff) | |
| download | mariadb-git-10.2-ssl.tar.gz | |
Fix compilation10.2-ssl
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 45d25ac3bf5..e819f003ab9 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5505,7 +5505,7 @@ static void handle_connections_methods() unireg_abort(1); // Will not return } - mysql_mutex_lock(&LOCK_thread_start); + mysql_mutex_lock(&LOCK_start_thread); mysql_cond_init(key_COND_handler_count, &COND_handler_count, NULL); handler_count=0; if (hPipe != INVALID_HANDLE_VALUE) @@ -5548,17 +5548,17 @@ static void handle_connections_methods() #endif while (handler_count > 0) - mysql_cond_wait(&COND_handler_count, &LOCK_thread_start); - mysql_mutex_unlock(&LOCK_thread_start); + mysql_cond_wait(&COND_handler_count, &LOCK_start_thread); + mysql_mutex_unlock(&LOCK_start_thread); DBUG_VOID_RETURN; } void decrement_handler_count() { - mysql_mutex_lock(&LOCK_thread_start); + mysql_mutex_lock(&LOCK_start_thread); if (--handler_count == 0) mysql_cond_signal(&COND_handler_count); - mysql_mutex_unlock(&LOCK_thread_start); + mysql_mutex_unlock(&LOCK_start_thread); my_thread_end(); } #else @@ -6838,7 +6838,7 @@ pthread_handler_t handle_connections_namedpipes(void *arg) hPipe=hConnectedPipe; continue; // We have to try again } - + CONNECT *connect; if (!(connect= new CONNECT) || !(connect->vio= vio_new_win32pipe(hConnectedPipe))) { |