diff options
| author | unknown <paul@frost.snake.net> | 2005-08-27 21:52:26 -0500 |
|---|---|---|
| committer | unknown <paul@frost.snake.net> | 2005-08-27 21:52:26 -0500 |
| commit | ee4db475ec79aab556d447f6144965b1095899d5 (patch) | |
| tree | 6b5aeb4836f709178067f488a95dff4329f54271 /sql/set_var.cc | |
| parent | 56b8fc52cfe81b22031ece94475d9a6f3fa663c2 (diff) | |
| parent | d7ff622e8d4dbbb2ea1a3f37049b190b54c30dd1 (diff) | |
| download | mariadb-git-ee4db475ec79aab556d447f6144965b1095899d5.tar.gz | |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 1b66b68b349..99985c3647c 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -868,16 +868,18 @@ struct show_var_st init_vars[]= { #endif {sys_sort_buffer.name, (char*) &sys_sort_buffer, SHOW_SYS}, {sys_sql_mode.name, (char*) &sys_sql_mode, SHOW_SYS}, - {sys_storage_engine.name, (char*) &sys_storage_engine, SHOW_SYS}, {"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 - {sys_sync_frm.name, (char*) &sys_sync_frm, SHOW_SYS}, #ifdef HAVE_TZNAME {"system_time_zone", system_time_zone, SHOW_CHAR}, #endif |