diff options
| author | unknown <petr@mysql.com> | 2004-11-18 14:53:21 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2004-11-18 14:53:21 +0300 |
| commit | e1f5b3f926ec7b2f582f975c867d2cc1877c1844 (patch) | |
| tree | b70c2bfed5cff7af70738e97f5524c8afa7e34c8 /sql/mysql_priv.h | |
| parent | cd2edd171396ba8041f4e0109e0f339b9b99ee0c (diff) | |
| parent | 4dac69eb11839d9c996669f88aba0230916efcbc (diff) | |
| download | mariadb-git-e1f5b3f926ec7b2f582f975c867d2cc1877c1844.tar.gz | |
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
sql/ha_innodb.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/structs.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 861c0e6d360..eced813f75d 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -991,7 +991,7 @@ extern ulong rpl_recovery_rank, thread_cache_size; extern ulong back_log; extern ulong specialflag, current_pid; extern ulong expire_logs_days, sync_binlog_period, sync_binlog_counter; -extern my_bool relay_log_purge, opt_innodb_safe_binlog; +extern my_bool relay_log_purge, opt_innodb_safe_binlog, opt_innodb; extern uint test_flags,select_errors,ha_open_options; extern uint protocol_version, mysqld_port, dropping_tables; extern uint delay_key_write_options, lower_case_table_names; |