Merge mysql.com:/usr/home/bar/mysql-5.0.b22645

into  mysql.com:/usr/home/bar/mysql-5.1.b22645

1 files changed, 7 insertions, 3 deletions

diff --git a/sql/set_var.h b/sql/set_var.h
index 01669b378e1..154a7cdd885 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -909,13 +909,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);