diff options
| author | Monty <monty@mariadb.org> | 2015-07-15 16:27:14 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-07-16 10:36:58 +0300 |
| commit | 872a953b228e93553ed056d8fa035ff06e884bc8 (patch) | |
| tree | a90958d21c610b2517705ab79666aacd8c837e84 /sql/sql_lex.h | |
| parent | df0498fd76897c0e034ab3f0598972f0e2419b02 (diff) | |
| download | mariadb-git-872a953b228e93553ed056d8fa035ff06e884bc8.tar.gz | |
MDEV-8469 Add RESET MASTER TO x to allow specification of binlog file nr
Other things:
- Avoid calling init_and_set_log_file_name() when opening binary log.
- Remove newlines early when reading from index file.
- Ensure that reset_logs() will work even if thd is 0 (Can happen on startup)
- Added thd to sart_slave_threads() for better error handling.
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 56f9bedc980..09a3d5e2585 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -2489,6 +2489,7 @@ public: USER_RESOURCES mqh; LEX_RESET_SLAVE reset_slave_info; ulonglong type; + ulong next_binlog_file_number; /* The following is used by KILL */ killed_state kill_signal; killed_type kill_type; |