diff options
| author | unknown <rafal@quant.(none)> | 2006-12-08 11:47:48 +0100 |
|---|---|---|
| committer | unknown <rafal@quant.(none)> | 2006-12-08 11:47:48 +0100 |
| commit | df2af6cdf0d45a64af4f0649934bb3483145f8a7 (patch) | |
| tree | 44df5f2b2fc2b0138690cdaaa1df76bb85420d67 /sql/sql_parse.cc | |
| parent | 9f37ea459c214e047fe7b0bea77d52e1027dec91 (diff) | |
| parent | b93baf4832951f70231a7d2063cfe4f41c677a8f (diff) | |
| download | mariadb-git-df2af6cdf0d45a64af4f0649934bb3483145f8a7.tar.gz | |
Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
into quant.(none):/ext/mysql/bk/mysql-5.0-bug24507
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index fec7e5ab20d..e539f6090d5 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2385,6 +2385,7 @@ static void reset_one_shot_variables(THD *thd) thd->update_charset(); thd->variables.time_zone= global_system_variables.time_zone; + thd->variables.lc_time_names= &my_locale_en_US; thd->one_shot_set= 0; } |