diff options
| author | Sujatha <sujatha.sivakumar@mariadb.com> | 2020-04-20 15:01:33 +0530 |
|---|---|---|
| committer | Sujatha <sujatha.sivakumar@mariadb.com> | 2020-04-20 15:02:09 +0530 |
| commit | 6014c5bbdf9a7a7898bc9fcff2a1faa762546b31 (patch) | |
| tree | 37d78ae7b12954cb49558f0ca58506e587b99c24 | |
| parent | b8b2bf104dd0549eaf59044f28afe8082c550f60 (diff) | |
| download | mariadb-git-bb-10.1-MDEV-21117.tar.gz | |
MDEV-21117: Fixing windows build failure.bb-10.1-MDEV-21117
Addressing Marko's review comments.
| -rw-r--r-- | sql/mysqld.h | 3 | ||||
| -rw-r--r-- | storage/innobase/log/log0recv.cc | 6 | ||||
| -rw-r--r-- | storage/xtradb/log/log0recv.cc | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index e939524dbff..515d5f39c3d 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -94,6 +94,7 @@ extern "C" MYSQL_PLUGIN_IMPORT CHARSET_INFO *system_charset_info; extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *files_charset_info ; extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *national_charset_info; extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *table_alias_charset; +extern MYSQL_PLUGIN_IMPORT bool opt_bin_log; /** Character set of the buildin error messages loaded from errmsg.sys. @@ -104,7 +105,7 @@ extern CHARSET_INFO *character_set_filesystem; extern MY_BITMAP temp_pool; extern bool opt_large_files, server_id_supplied; -extern bool opt_update_log, opt_bin_log, opt_error_log; +extern bool opt_update_log, opt_error_log; extern my_bool opt_log, opt_bootstrap; extern my_bool opt_backup_history_log; extern my_bool opt_backup_progress_log; diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc index bddc8a4218f..0e4a6206e09 100644 --- a/storage/innobase/log/log0recv.cc +++ b/storage/innobase/log/log0recv.cc @@ -63,13 +63,14 @@ Created 9/20/1997 Heikki Tuuri # include "sync0sync.h" #else /* !UNIV_HOTBACKUP */ - /** This is set to FALSE if the backup was originally taken with the mysqlbackup --include regexp option: then we do not want to create tables in directories which were not included */ UNIV_INTERN ibool recv_replay_file_ops = TRUE; #endif /* !UNIV_HOTBACKUP */ +extern MYSQL_PLUGIN_IMPORT bool opt_bin_log; + /** Log records are stored in the hash table in chunks at most of this size; this must be less than UNIV_PAGE_SIZE as it is stored in the buffer pool */ #define RECV_DATA_BLOCK_SIZE (MEM_MAX_ALLOC_IN_BUF - sizeof(recv_data_t)) @@ -3301,8 +3302,7 @@ void recv_recovery_from_checkpoint_finish(void) /*======================================*/ { - if (opt_bin_log) - { + if (opt_bin_log) { trx_sys_print_mysql_master_log_pos(); trx_sys_print_mysql_binlog_offset(); } diff --git a/storage/xtradb/log/log0recv.cc b/storage/xtradb/log/log0recv.cc index effab141040..e25064bebd8 100644 --- a/storage/xtradb/log/log0recv.cc +++ b/storage/xtradb/log/log0recv.cc @@ -77,6 +77,8 @@ directories which were not included */ UNIV_INTERN ibool recv_replay_file_ops = TRUE; #endif /* !UNIV_HOTBACKUP */ +extern MYSQL_PLUGIN_IMPORT bool opt_bin_log; + /** Log records are stored in the hash table in chunks at most of this size; this must be less than UNIV_PAGE_SIZE as it is stored in the buffer pool */ #define RECV_DATA_BLOCK_SIZE (MEM_MAX_ALLOC_IN_BUF - sizeof(recv_data_t)) @@ -3397,8 +3399,7 @@ void recv_recovery_from_checkpoint_finish(void) /*======================================*/ { - if (opt_bin_log) - { + if (opt_bin_log) { trx_sys_print_mysql_master_log_pos(); trx_sys_print_mysql_binlog_offset(); } |