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/mysqld.cc | |
| 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/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 692af10052f..5cd9d19131b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5292,7 +5292,7 @@ static int init_server_components() * but to be able to have mysql_mutex_assert_owner() in code, * we do it anyway */ mysql_mutex_lock(mysql_bin_log.get_log_lock()); - if (mysql_bin_log.open(opt_bin_logname, LOG_BIN, 0, + if (mysql_bin_log.open(opt_bin_logname, LOG_BIN, 0, 0, WRITE_CACHE, max_binlog_size, 0, TRUE)) unireg_abort(1); mysql_mutex_unlock(mysql_bin_log.get_log_lock()); |