From 224660d14acb702c57ff0f31a7722413cdd5a31b Mon Sep 17 00:00:00 2001
From: "bar@mysql.com/bar.intranet.mysql.r18.ru" <>
Date: Tue, 5 Dec 2006 13:45:21 +0400
Subject: Bug#22645 LC_TIME_NAMES: Statement not replicated Problem:
 replication of LC_TIME_NAMES didn't work. Thus, INSERTS or UPDATES using
 date_format() always worked with en_US on the slave side. Fix: adding
 ONE_SHOT implementation for LC_TIME_NAMES.

---
 sql/set_var.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'sql/set_var.h')

diff --git a/sql/set_var.h b/sql/set_var.h
index 1ae3a18111f..78b34963e9d 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -764,12 +764,16 @@ class sys_var_thd_lc_time_names :public sys_var_thd
 public:
   sys_var_thd_lc_time_names(const char *name_arg):
     sys_var_thd(name_arg) 
-  {}
+  {
+#if MYSQL_VERSION_ID < 50000
+    no_support_one_shot= 0;
+#endif
+  }
   bool check(THD *thd, set_var *var);
   SHOW_TYPE type() { return SHOW_CHAR; }
   bool check_update_type(Item_result type)
   {
-    return type != STRING_RESULT;		/* Only accept strings */
+    return ((type != STRING_RESULT) && (type != INT_RESULT));
   }
   bool check_default(enum_var_type type) { return 0; }
   bool update(THD *thd, set_var *var);
-- 
cgit v1.2.1


From 9f36c1c286ebf411ef3eda0a88ab563c18898edd Mon Sep 17 00:00:00 2001
From: "cbell/Chuck@suse.vabb.com" <>
Date: Thu, 7 Dec 2006 09:18:35 -0500
Subject: WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code. Please
 see worklog for details on files changed.

---
 sql/set_var.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'sql/set_var.h')

diff --git a/sql/set_var.h b/sql/set_var.h
index 01669b378e1..6135fdee159 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -940,9 +940,7 @@ public:
   }
 };
 
-#ifdef HAVE_ROW_BASED_REPLICATION
 extern void fix_binlog_format_after_update(THD *thd, enum_var_type type);
-#endif
 
 class sys_var_thd_binlog_format :public sys_var_thd_enum
 {
@@ -950,9 +948,7 @@ public:
   sys_var_thd_binlog_format(const char *name_arg, ulong SV::*offset_arg)
     :sys_var_thd_enum(name_arg, offset_arg,
                       &binlog_format_typelib
-#ifdef HAVE_ROW_BASED_REPLICATION
                       , fix_binlog_format_after_update
-#endif
                       )
   {};
   bool is_readonly() const;
-- 
cgit v1.2.1