diff options
| author | sasha@mysql.sashanet.com <> | 2002-01-19 22:46:25 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2002-01-19 22:46:25 -0700 |
| commit | 684f13ef4c20cc1843c615ee17a8013f65617442 (patch) | |
| tree | 254bb1b067e503a819145fff488d83709bf9c798 /libmysqld | |
| parent | d7ad2cbe5b55d422affe8d180d0cc8dab1c518e1 (diff) | |
| parent | 56129ce634088b51dd60381711519c9125e8df72 (diff) | |
| download | mariadb-git-684f13ef4c20cc1843c615ee17a8013f65617442.tar.gz | |
Ugly merge! But I am not done yet - there are a number of things I need to fix
before I can push
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 1e3ed54ac88..368e8909bbf 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -402,8 +402,8 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) (void) pthread_mutex_init(&LOCK_bytes_sent,MY_MUTEX_INIT_FAST); (void) pthread_mutex_init(&LOCK_bytes_received,MY_MUTEX_INIT_FAST); (void) pthread_mutex_init(&LOCK_timezone,MY_MUTEX_INIT_FAST); - (void) pthread_mutex_init(&LOCK_binlog_update, MY_MUTEX_INIT_FAST); // QQ NOT USED - (void) pthread_mutex_init(&LOCK_slave, MY_MUTEX_INIT_FAST); + (void) pthread_mutex_init(&LOCK_slave_io, MY_MUTEX_INIT_FAST); + (void) pthread_mutex_init(&LOCK_slave_sql, MY_MUTEX_INIT_FAST); (void) pthread_mutex_init(&LOCK_server_id, MY_MUTEX_INIT_FAST); (void) pthread_mutex_init(&LOCK_user_conn, MY_MUTEX_INIT_FAST); (void) pthread_cond_init(&COND_thread_count,NULL); @@ -412,8 +412,11 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) (void) pthread_cond_init(&COND_flush_thread_cache,NULL); (void) pthread_cond_init(&COND_manager,NULL); (void) pthread_cond_init(&COND_binlog_update, NULL); - (void) pthread_cond_init(&COND_slave_stopped, NULL); - (void) pthread_cond_init(&COND_slave_start, NULL); + (void) pthread_cond_init(&COND_slave_log_update, NULL); + (void) pthread_cond_init(&COND_slave_sql_stop, NULL); + (void) pthread_cond_init(&COND_slave_sql_start, NULL); + (void) pthread_cond_init(&COND_slave_sql_stop, NULL); + (void) pthread_cond_init(&COND_slave_sql_start, NULL); if (set_default_charset_by_name(default_charset, MYF(MY_WME))) { |