diff options
| author | unknown <guilhem@mysql.com> | 2003-07-06 18:01:39 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-07-06 18:01:39 +0200 |
| commit | 964c2fe0839fb95070f51eb736658185cf539a34 (patch) | |
| tree | 155964e7db5b390bb1ec5071a59f1279b5f2eeb1 /sql/mysql_priv.h | |
| parent | da1be35be8ce5f09f18f2d87bfb58e8ea139ec6a (diff) | |
| parent | 27601fc5ee2366ddb7926a82aa50058dc9548e0e (diff) | |
| download | mariadb-git-964c2fe0839fb95070f51eb736658185cf539a34.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
sql/mysql_priv.h:
Auto merged
sql/slave.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index ce23abb6b2c..0a4728ef325 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -618,8 +618,8 @@ bool fn_format_relative_to_data_home(my_string to, const char *name, bool open_log(MYSQL_LOG *log, const char *hostname, const char *opt_name, const char *extension, const char *index_file_name, - enum_log_type type, bool read_append = 0, - bool no_auto_events = 0); + enum_log_type type, bool read_append, + bool no_auto_events, ulong max_size); /* mysqld.cc */ void clear_error_message(THD *thd); @@ -666,7 +666,8 @@ extern ulong max_insert_delayed_threads, max_user_connections; extern ulong long_query_count, what_to_log,flush_time,opt_sql_mode; extern ulong query_buff_size, thread_stack,thread_stack_min; 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 max_binlog_size, max_relay_log_size; +extern ulong rpl_recovery_rank, thread_cache_size; extern ulong com_stat[(uint) SQLCOM_END], com_other, back_log; extern ulong specialflag, current_pid; |