Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1

into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

3 files changed, 39 insertions, 1 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 5367e67c32a..c364b408f28 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4098,7 +4098,11 @@ enum options_mysqld
   OPT_RANGE_ALLOC_BLOCK_SIZE,
   OPT_QUERY_ALLOC_BLOCK_SIZE, OPT_QUERY_PREALLOC_SIZE,
   OPT_TRANS_ALLOC_BLOCK_SIZE, OPT_TRANS_PREALLOC_SIZE,
-  OPT_SYNC_FRM, OPT_SYNC_BINLOG, OPT_BDB_NOSYNC,
+  OPT_SYNC_FRM, OPT_SYNC_BINLOG,
+  OPT_SYNC_REPLICATION,
+  OPT_SYNC_REPLICATION_SLAVE_ID,
+  OPT_SYNC_REPLICATION_TIMEOUT,
+  OPT_BDB_NOSYNC,
   OPT_ENABLE_SHARED_MEMORY,
   OPT_SHARED_MEMORY_BASE_NAME,
   OPT_OLD_PASSWORDS,
@@ -5211,6 +5215,21 @@ The minimum value for this variable is 4096.",
    (gptr*) &sync_binlog_period,
    (gptr*) &sync_binlog_period, 0, GET_ULONG, REQUIRED_ARG, 0, 0, ~0L, 0, 1,
    0},
+  {"sync-replication", OPT_SYNC_REPLICATION,
+   "Enable synchronous replication",
+   (gptr*) &global_system_variables.sync_replication,
+   (gptr*) &global_system_variables.sync_replication,
+   0, GET_ULONG, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},
+  {"sync-replication-slave-id", OPT_SYNC_REPLICATION_SLAVE_ID,
+   "Synchronous replication is wished for this slave",
+   (gptr*) &global_system_variables.sync_replication_slave_id,
+   (gptr*) &global_system_variables.sync_replication_slave_id,
+   0, GET_ULONG, REQUIRED_ARG, 0, 0, ~0L, 0, 1, 0},
+  {"sync-replication-timeout", OPT_SYNC_REPLICATION_TIMEOUT,
+   "Synchronous replication timeout",
+   (gptr*) &global_system_variables.sync_replication_timeout,
+   (gptr*) &global_system_variables.sync_replication_timeout,
+   0, GET_ULONG, REQUIRED_ARG, 10, 0, ~0L, 0, 1, 0},
   {"sync-frm", OPT_SYNC_FRM, "Sync .frm to disk on create. Enabled by default",
    (gptr*) &opt_sync_frm, (gptr*) &opt_sync_frm, 0, GET_BOOL, NO_ARG, 1, 0,
    0, 0, 0, 0},
diff --git a/sql/set_var.cc b/sql/set_var.cc
index f08d399f81c..ca7987d2636 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -333,6 +333,14 @@ 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",
@@ -605,6 +613,9 @@ sys_var *sys_variables[]=
   &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,
@@ -850,6 +861,9 @@ struct show_var_st init_vars[]= {
   {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},
+  {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
diff --git a/sql/sql_class.h b/sql/sql_class.h
index ce60ed06cfd..8128690ab02 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -397,6 +397,11 @@ struct system_variables
   my_bool low_priority_updates;
   my_bool new_mode;
   my_bool query_cache_wlock_invalidate;
+#ifdef HAVE_REPLICATION
+  ulong sync_replication;
+  ulong sync_replication_slave_id;
+  ulong sync_replication_timeout;
+#endif /* HAVE_REPLICATION */
 #ifdef HAVE_INNOBASE_DB
   my_bool innodb_table_locks;
 #endif /* HAVE_INNOBASE_DB */