List:Commits« Previous MessageNext Message »
From:Greg Lehey Date:April 24 2006 9:43am
Subject:bk commit into 5.0 tree (grog:1.2106)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of grog. When grog does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2106 06/04/24 17:13:21 grog@stripped +1 -0
  set_var.cc:
    Reinstate sync_binlog_period, accidentally removed in patch set 1.2152.

  sql/set_var.cc
    1.154 06/04/24 17:11:24 grog@stripped +9 -0
    Reinstate sync_binlog_period, accidentally removed in patch set 1.2152.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	grog
# Host:	eucla.lemis.com
# Root:	/home/MySQL/5.0-Bug-17248

--- 1.153/sql/set_var.cc	2006-04-13 16:55:52 +09:30
+++ 1.154/sql/set_var.cc	2006-04-24 17:11:24 +09:30
@@ -376,6 +376,9 @@
 				       &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);
+#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);
@@ -697,6 +700,9 @@
   &sys_sql_warnings,
   &sys_sql_notes,
   &sys_storage_engine,
+#ifdef HAVE_REPLICATION
+  &sys_sync_binlog_period,
+#endif
   &sys_sync_frm,
   &sys_table_cache_size,
   &sys_table_lock_wait_timeout,
@@ -992,6 +998,9 @@
   {"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_TZNAME
   {"system_time_zone",        system_time_zone,                     SHOW_CHAR},
Thread
bk commit into 5.0 tree (grog:1.2106)Greg Lehey24 Apr