diff options
author | unknown <gluh@gluh.mysql.r18.ru> | 2003-03-11 16:32:17 +0400 |
---|---|---|
committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-03-11 16:32:17 +0400 |
commit | b0e79dea6c82d0f78422ea6a59c64c79a0e20dd9 (patch) | |
tree | 1a27ba4c4a93d54b53e2469bc0f8e600f74e91cb /sql/sql_repl.h | |
parent | d7efaf8cbed8b55b6c1f52c7131787fa9000f71c (diff) | |
parent | 90c399c0d5d96fcb55e2c6714d9e88ff30c8a818 (diff) | |
download | mariadb-git-b0e79dea6c82d0f78422ea6a59c64c79a0e20dd9.tar.gz |
Conflicts relsolving
mysql-test/t/rpl_rotate_logs.test:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
Diffstat (limited to 'sql/sql_repl.h')
-rw-r--r-- | sql/sql_repl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_repl.h b/sql/sql_repl.h index f1fda45fe4b..e3d600b9798 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -34,6 +34,7 @@ int cmp_master_pos(const char* log_file_name1, ulonglong log_pos1, int reset_slave(THD *thd, MASTER_INFO* mi); int reset_master(THD* thd); int purge_master_logs(THD* thd, const char* to_log); +int purge_master_logs_before_date(THD* thd, time_t purge_time); bool log_in_use(const char* log_name); void adjust_linfo_offsets(my_off_t purge_offset); int show_binlogs(THD* thd); |