diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-08-24 05:44:16 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-08-24 05:44:16 +0300 |
| commit | 02f8c163e65139ef3d2d7a9967611b30ac6c0f72 (patch) | |
| tree | 1c291b78b8e23fd7562cf7e469a4f2bb2e8f4565 /sql/slave.h | |
| parent | 839ebeca5ac7c46d53f39d41f57f264767a32c96 (diff) | |
| download | mariadb-git-02f8c163e65139ef3d2d7a9967611b30ac6c0f72.tar.gz | |
Give better error from reconnect()
Fixed hang in start_slave_threads() when thread dies quickly.
Docs/manual.texi:
Changelog
client/mysqltest.c:
Indentation cleanup
More DBUG info
libmysql/libmysql.c:
More DBUG info
Give better error from reconnect()
mysql-test/r/rpl_rotate_logs.result:
Update results
mysql-test/t/rpl_log_pos.test:
Fix for fast machines
mysql-test/t/rpl_rotate_logs.test:
Updated test to be more portable
scripts/mysql_zap.sh:
Update for MacOSX
sql/mini_client.cc:
Better error messages from reconnect.
Indentation cleanups
sql/slave.cc:
Fixed hang in start_slave_threads() when thread dies quickly.
sql/slave.h:
Fixed hang in start_slave_threads() when thread dies quickly.
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/slave.h b/sql/slave.h index 4be01785177..b527aceb432 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -154,6 +154,7 @@ typedef struct st_relay_log_info */ volatile uint32 slave_skip_counter; volatile ulong abort_pos_wait; /* Incremented on change master */ + volatile ulong slave_run_id; /* Incremented on slave start */ pthread_mutex_t log_space_lock; pthread_cond_t log_space_cond; THD * sql_thd; @@ -171,8 +172,8 @@ typedef struct st_relay_log_info st_relay_log_info() :info_fd(-1),cur_log_fd(-1), cur_log_old_open_count(0), abort_pos_wait(0), - inited(0), abort_slave(0), slave_running(0), log_pos_current(0), - skip_log_purge(0) + slave_run_id(0), inited(0), abort_slave(0), slave_running(0), + log_pos_current(0), skip_log_purge(0) { relay_log_name[0] = master_log_name[0] = 0; bzero(&info_file,sizeof(info_file)); @@ -283,11 +284,13 @@ typedef struct st_master_info bool inited; bool old_format; /* master binlog is in 3.23 format */ volatile bool abort_slave, slave_running; + volatile ulong slave_run_id; bool ignore_stop_event; - st_master_info():fd(-1), io_thd(0), inited(0), old_format(0),abort_slave(0), - slave_running(0) + st_master_info() + :fd(-1), io_thd(0), inited(0), old_format(0),abort_slave(0), + slave_running(0), slave_run_id(0) { host[0] = 0; user[0] = 0; password[0] = 0; bzero(&file, sizeof(file)); @@ -360,7 +363,8 @@ int start_slave_threads(bool need_slave_mutex, bool wait_for_start, int start_slave_thread(pthread_handler h_func, pthread_mutex_t* start_lock, pthread_mutex_t *cond_lock, pthread_cond_t* start_cond, - volatile bool* slave_running, + volatile bool *slave_running, + volatile ulong *slave_run_id, MASTER_INFO* mi); /* If fd is -1, dump to NET */ |