summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2019-08-06 13:04:18 +0400
committerSergey Vojtovich <svoj@mariadb.org>2019-08-22 13:20:30 +0400
commite976d9561463eb50a46f174c9fbf62c5cd4786a6 (patch)
treeff1cdfbd07883ed34487aa12d60c715c67b552b3 /sql/log.cc
parent1d58e62d5bb6069722118568311f58848c57c1d8 (diff)
downloadmariadb-git-e976d9561463eb50a46f174c9fbf62c5cd4786a6.tar.gz
Cleanup MYSQL_LOG
Embed MYSQL_LOG::init(). Reduce visibility of MYSQL_LOG::init_and_set_log_file_name(). Cleanup unused mysql_bin_log_file_name() and mysql_bin_log_file_pos().
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc32
1 files changed, 2 insertions, 30 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 78c1debcb4d..31ef26db1b4 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2590,24 +2590,14 @@ end:
}
-void MYSQL_LOG::init(enum_log_type log_type_arg,
- enum cache_type io_cache_type_arg)
-{
- DBUG_ENTER("MYSQL_LOG::init");
- log_type= log_type_arg;
- io_cache_type= io_cache_type_arg;
- DBUG_PRINT("info",("log_type: %d", log_type));
- DBUG_VOID_RETURN;
-}
-
-
bool MYSQL_LOG::init_and_set_log_file_name(const char *log_name,
const char *new_name,
ulong next_log_number,
enum_log_type log_type_arg,
enum cache_type io_cache_type_arg)
{
- init(log_type_arg, io_cache_type_arg);
+ log_type= log_type_arg;
+ io_cache_type= io_cache_type_arg;
if (new_name)
{
@@ -10438,24 +10428,6 @@ MYSQL_BIN_LOG::do_binlog_recovery(const char *opt_name, bool do_xa_recovery)
#ifdef INNODB_COMPATIBILITY_HOOKS
-/**
- Get the file name of the MySQL binlog.
- @return the name of the binlog file
-*/
-extern "C"
-const char* mysql_bin_log_file_name(void)
-{
- return mysql_bin_log.get_log_fname();
-}
-/**
- Get the current position of the MySQL binlog.
- @return byte offset from the beginning of the binlog
-*/
-extern "C"
-ulonglong mysql_bin_log_file_pos(void)
-{
- return (ulonglong) mysql_bin_log.get_log_file()->pos_in_file;
-}
/*
Get the current position of the MySQL binlog for transaction currently being
committed.