diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-12-05 16:09:27 +0400 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-12-05 16:09:27 +0400 |
| commit | fd06945428a2ea6c28b796f5174ecff74f30c318 (patch) | |
| tree | 15b9590db38a89ab16b077137abc4073a06e2991 /sql/set_var.h | |
| parent | 733fb20dcd9e68fd0b53799e77ebea00679887de (diff) | |
| parent | 21b9187ab95bd2a9e7575899643c997b08560f52 (diff) | |
| download | mariadb-git-fd06945428a2ea6c28b796f5174ecff74f30c318.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0.b22645
into mysql.com:/usr/home/bar/mysql-5.1.b22645
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/t/disabled.def:
After merge fix
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 10 |
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); |