Merge kite-hub.kitebird.com:/tmp/merge-4.1

into kite-hub.kitebird.com:/tmp/merge-5.0

Merge kite-hub.kitebird.com:/tmp/merge-4.1
into kite-hub.kitebird.com:/tmp/merge-5.0
9cedc584 · paul@kite-hub.kitebird.com · 3091eb3f · c0080aeb · 9cedc584 · 9cedc584
Commit 9cedc584 authored Aug 30, 2005 by paul@kite-hub.kitebird.com
Hide whitespace changes
Inline Side-by-side

Showing with 583 additions and 949 deletions

sql/mysqld.cc sql/mysqld.cc +579 -947

sql/set_var.cc sql/set_var.cc +4 -2

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -965,16 +965,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