diff options
| author | hf@deer.mysql.r18.ru <> | 2003-01-15 13:15:35 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2003-01-15 13:15:35 +0400 |
| commit | 96089e2b3a013c83e812672284bf10a34ba9d11c (patch) | |
| tree | 937beb6f27e5e7958081a4a5ba13ceb2f5251396 /sql/slave.h | |
| parent | c59bff7c96bf90c9c4dafdb80684fb438bb43734 (diff) | |
| parent | 809af00b0672242cc1b0fee114a34f414ec9055a (diff) | |
| download | mariadb-git-96089e2b3a013c83e812672284bf10a34ba9d11c.tar.gz | |
resolving conflicts
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/slave.h b/sql/slave.h index 358762306e2..8122975a809 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -188,11 +188,13 @@ typedef struct st_relay_log_info volatile bool abort_slave, slave_running; bool log_pos_current; bool skip_log_purge; - + bool inside_transaction; + st_relay_log_info() - :info_fd(-1),cur_log_fd(-1), cur_log_old_open_count(0), abort_pos_wait(0), - slave_run_id(0), inited(0), abort_slave(0), slave_running(0), - log_pos_current(0), skip_log_purge(0) + :info_fd(-1),cur_log_fd(-1), cur_log_old_open_count(0), abort_pos_wait(0), + slave_run_id(0), inited(0), abort_slave(0), slave_running(0), + log_pos_current(0), skip_log_purge(0), + inside_transaction(0) /* the default is autocommit=1 */ { relay_log_name[0] = master_log_name[0] = 0; bzero(&info_file,sizeof(info_file)); |