diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-01-22 15:05:11 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-01-22 15:05:11 -0700 |
| commit | 11f04648f2ff2deaa00fe85ea0317c2f3d6679a9 (patch) | |
| tree | 18fac541370eed6d6619f07e64d288a8a6742b12 /libmysqld | |
| parent | 1e0f2b7a4288b85d6b1d287056e2acfb3257f284 (diff) | |
| download | mariadb-git-11f04648f2ff2deaa00fe85ea0317c2f3d6679a9.tar.gz | |
post-merge fixes, including slave-skip-errors backport
fixed too quick timeout in mysql-test-run which caused a race with the
new server getting started before the old one completely finished
shutdown. This should fix the pid warning we've been getting as well as
inconsistent results when running tests with the manager
libmysqld/lib_sql.cc:
post-merge fix
mysql-test/mysql-test-run.sh:
fixed start/stop timeout and cleanup of log directory
mysql-test/r/rpl000014.result:
post-merge fix
mysql-test/r/rpl000015.result:
post-merge fix
mysql-test/r/rpl000016.result:
post-merge fix
mysql-test/r/rpl_log.result:
post-merge fix
sql/log_event.cc:
post-merge fix
sql/slave.cc:
post-merge fix
sql/slave.h:
post-merge fix
sql/sql_class.h:
post-merge fix
tools/mysqlmanager.c:
added debug message
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 368e8909bbf..0097aa5068d 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -402,9 +402,6 @@ 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_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); (void) pthread_cond_init(&COND_refresh,NULL); @@ -412,11 +409,6 @@ 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_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))) { |