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 | 4901295af1d1e5fa30225eae5c21862f9d00be42 (patch) | |
| tree | 1a27ba4c4a93d54b53e2469bc0f8e600f74e91cb /sql/mysql_priv.h | |
| parent | bbc8f836c0400f361458bffd42d71ea2177a9e18 (diff) | |
| parent | 92457d6e45dff4561c53bdd7feec1595585a65af (diff) | |
| download | mariadb-git-4901295af1d1e5fa30225eae5c21862f9d00be42.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/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index cf9f19671f9..df9fbd5da53 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -713,6 +713,7 @@ extern ulong binlog_cache_size, max_binlog_cache_size, open_files_limit; extern ulong max_binlog_size, rpl_recovery_rank, thread_cache_size; extern ulong com_stat[(uint) SQLCOM_END], com_other, back_log; extern ulong specialflag, current_pid; +extern ulong expire_logs_days; extern uint test_flags,select_errors,ha_open_options; extern uint protocol_version,dropping_tables; |