Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


configure.in:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged

1 files changed, 7 insertions, 7 deletions

diff --git a/sql/set_var.h b/sql/set_var.h
index f957ec931d6..b0e9c8fd335 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -922,13 +922,17 @@ 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)
-  {}
+    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);
@@ -953,9 +957,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
 {
@@ -963,9 +965,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;