diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-05-19 12:02:11 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-05-19 12:02:11 +0300 |
| commit | 68aa31f268660db07b634f021716ecb872e19679 (patch) | |
| tree | 9b5bb42bcf35d6fb7d7ff5aad8930119d0ec921e /sql/mysql_priv.h | |
| parent | c2c0e70ffe28660f3d15ad7dcea74fce7f6ceae2 (diff) | |
| parent | 18dd37b8a101dab654a896eabd9e73bc71aed8ca (diff) | |
| download | mariadb-git-68aa31f268660db07b634f021716ecb872e19679.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 82bb6659c7e..2c28fcf03bb 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -627,7 +627,6 @@ extern char language[LIBLEN],reg_ext[FN_EXTLEN]; extern char glob_hostname[FN_REFLEN], mysql_home[FN_REFLEN]; extern char pidfile_name[FN_REFLEN], time_zone[30], *opt_init_file; extern char log_error_file[FN_REFLEN]; -extern char blob_newline; extern double log_10[32]; extern ulonglong keybuff_size; extern ulong refresh_version,flush_version, thread_id,query_id,opened_tables; @@ -671,8 +670,8 @@ extern uint volatile thread_count, thread_running, global_read_lock; extern my_bool opt_sql_bin_update, opt_safe_user_create, opt_no_mix_types; extern my_bool opt_safe_show_db, opt_local_infile, lower_case_table_names; extern my_bool opt_slave_compressed_protocol, use_temp_pool; +extern my_bool opt_readonly; extern my_bool opt_enable_named_pipe; -extern char f_fyllchar; extern MYSQL_LOG mysql_log,mysql_update_log,mysql_slow_log,mysql_bin_log; extern FILE *bootstrap_file; |