diff options
author | unknown <elliot@mysql.com> | 2006-04-21 14:21:17 -0400 |
---|---|---|
committer | unknown <elliot@mysql.com> | 2006-04-21 14:21:17 -0400 |
commit | e0f275ecb4bea77f85c615b6950e0f1fdf6abe69 (patch) | |
tree | 9bf7bbcb520858753deb3d4450d0babb9298e304 /sql/set_var.cc | |
parent | 46da233ad0e1644e2f832eec924139f8db86bf3d (diff) | |
download | mariadb-git-e0f275ecb4bea77f85c615b6950e0f1fdf6abe69.tar.gz |
After merge fixes.
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r-- | sql/set_var.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 59e0c7b6ff7..16a0c752639 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -436,14 +436,6 @@ sys_var_thd_storage_engine sys_storage_engine("storage_engine", &SV::table_type); #ifdef HAVE_REPLICATION sys_var_sync_binlog_period sys_sync_binlog_period("sync_binlog", &sync_binlog_period); -sys_var_thd_ulong sys_sync_replication("sync_replication", - &SV::sync_replication); -sys_var_thd_ulong sys_sync_replication_slave_id( - "sync_replication_slave_id", - &SV::sync_replication_slave_id); -sys_var_thd_ulong sys_sync_replication_timeout( - "sync_replication_timeout", - &SV::sync_replication_timeout); #endif sys_var_bool_ptr sys_sync_frm("sync_frm", &opt_sync_frm); sys_var_long_ptr sys_table_def_size("table_definition_cache", @@ -966,11 +958,6 @@ SHOW_VAR init_vars[]= { {sys_sync_binlog_period.name,(char*) &sys_sync_binlog_period, SHOW_SYS}, #endif {sys_sync_frm.name, (char*) &sys_sync_frm, SHOW_SYS}, -#ifdef HAVE_REPLICATION - {sys_sync_replication.name, (char*) &sys_sync_replication, SHOW_SYS}, - {sys_sync_replication_slave_id.name, (char*) &sys_sync_replication_slave_id,SHOW_SYS}, - {sys_sync_replication_timeout.name, (char*) &sys_sync_replication_timeout,SHOW_SYS}, -#endif #ifdef HAVE_TZNAME {"system_time_zone", system_time_zone, SHOW_CHAR}, #endif |