diff options
| author | unknown <grog@mysql.com[grog]> | 2006-04-13 17:22:56 +0930 |
|---|---|---|
| committer | unknown <grog@mysql.com[grog]> | 2006-04-13 17:22:56 +0930 |
| commit | 365f6f6f03a247976eabd64fe9d8510b456647f4 (patch) | |
| tree | 5068606c120d0affa61289212c97ed0321bc9003 /sql/set_var.cc | |
| parent | ce33555014b52d43b1f6911b24abf6ac0da62550 (diff) | |
| download | mariadb-git-365f6f6f03a247976eabd64fe9d8510b456647f4.tar.gz | |
foo2
sql/ha_innodb.cc:
Import patch foo2
sql/ha_innodb.h:
Import patch foo2
sql/handler.cc:
Import patch foo2
sql/handler.h:
Import patch foo2
sql/mysqld.cc:
Import patch foo2
sql/set_var.cc:
Import patch foo2
sql/sql_class.h:
Import patch foo2
sql/sql_repl.cc:
Import patch foo2
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 762b8d7ec60..a0b60251354 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -376,17 +376,6 @@ sys_var_thd_table_type sys_table_type("table_type", &SV::table_type); 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_cache_size("table_cache", &table_cache_size); @@ -708,12 +697,6 @@ sys_var *sys_variables[]= &sys_sql_warnings, &sys_sql_notes, &sys_storage_engine, -#ifdef HAVE_REPLICATION - &sys_sync_binlog_period, - &sys_sync_replication, - &sys_sync_replication_slave_id, - &sys_sync_replication_timeout, -#endif &sys_sync_frm, &sys_table_cache_size, &sys_table_lock_wait_timeout, @@ -1009,15 +992,7 @@ struct show_var_st init_vars[]= { {"sql_notes", (char*) &sys_sql_notes, SHOW_BOOL}, {"sql_warnings", (char*) &sys_sql_warnings, SHOW_BOOL}, {sys_storage_engine.name, (char*) &sys_storage_engine, SHOW_SYS}, -#ifdef HAVE_REPLICATION - {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 |