diff options
| author | unknown <jimw@mysql.com> | 2005-05-16 14:33:46 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-16 14:33:46 -0700 |
| commit | 9b07cafe1e7a1230218c06f85b88f68b5741c9ef (patch) | |
| tree | b04d28799e3a9c9c0f6d24218934e5de704bb1c0 /sql/set_var.cc | |
| parent | 9c71571f8391252752be68c36d29c6629dd2668b (diff) | |
| parent | e9beb6d0aa8056d01637272d1782e2ae2482762d (diff) | |
| download | mariadb-git-9b07cafe1e7a1230218c06f85b88f68b5741c9ef.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-7800
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/set_var.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 373a499f485..9e26a1f2626 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -945,7 +945,11 @@ struct show_var_st init_vars[]= { {"skip_networking", (char*) &opt_disable_networking, SHOW_BOOL}, {"skip_show_database", (char*) &opt_skip_show_db, SHOW_BOOL}, #ifdef HAVE_REPLICATION + {sys_slave_compressed_protocol.name, + (char*) &sys_slave_compressed_protocol, SHOW_SYS}, + {"slave_load_tmpdir", (char*) &slave_load_tmpdir, SHOW_CHAR_PTR}, {sys_slave_net_timeout.name,(char*) &sys_slave_net_timeout, SHOW_SYS}, + {"slave_skip_errors", (char*) &slave_error_mask, SHOW_SLAVE_SKIP_ERRORS}, {sys_slave_trans_retries.name,(char*) &sys_slave_trans_retries, SHOW_SYS}, #endif {sys_slow_launch_time.name, (char*) &sys_slow_launch_time, SHOW_SYS}, |