summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-05-16 14:33:46 -0700
committerjimw@mysql.com <>2005-05-16 14:33:46 -0700
commitbe4920cd813fdb5ce92897bfb710b43eaf189cac (patch)
treeb04d28799e3a9c9c0f6d24218934e5de704bb1c0 /sql/set_var.cc
parent3b3d00c4a2c9358fdb8e40c66c4ad076dd05d21d (diff)
parent4412ad4e1163c166c1603f313913da2660ad6062 (diff)
downloadmariadb-git-be4920cd813fdb5ce92897bfb710b43eaf189cac.tar.gz
Merge mysql.com:/home/jimw/my/mysql-5.0-7800
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc4
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},