diff options
| author | monty@hundin.mysql.fi <> | 2002-08-21 22:04:22 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-08-21 22:04:22 +0300 |
| commit | 03b0179af9f3492c4682dbc85542529215010a7c (patch) | |
| tree | 75f29bea26c7fd21a45f22fd906c7a1545aaee91 /sql/slave.h | |
| parent | a5edb200421018ee967045903b2802c2d5c1bd75 (diff) | |
| download | mariadb-git-03b0179af9f3492c4682dbc85542529215010a7c.tar.gz | |
Use our version of RWLOCKS on UNIXWARE 7
More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.h b/sql/slave.h index c59ab03c275..790205a1105 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -152,6 +152,7 @@ typedef struct st_relay_log_info errors, and have been manually applied by DBA already. */ volatile uint32 slave_skip_counter; + volatile ulong abort_pos_wait; /* Incremented on change master */ pthread_mutex_t log_space_lock; pthread_cond_t log_space_cond; THD * sql_thd; @@ -165,13 +166,12 @@ typedef struct st_relay_log_info bool inited; volatile bool abort_slave, slave_running; bool log_pos_current; - bool abort_pos_wait; bool skip_log_purge; st_relay_log_info() - :info_fd(-1),cur_log_fd(-1), cur_log_old_open_count(0), + :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), - abort_pos_wait(0), skip_log_purge(0) + skip_log_purge(0) { relay_log_name[0] = master_log_name[0] = 0; bzero(&info_file,sizeof(info_file)); |