diff options
| author | unknown <lars@mysql.com/black.(none)> | 2006-12-08 23:33:39 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com/black.(none)> | 2006-12-08 23:33:39 +0100 |
| commit | cacaef6e44ed2fb7a42f5d3bfc713877a138a280 (patch) | |
| tree | e603834affcc44ee4ccebccd7ce99351c3f56e77 /sql/sql_parse.cc | |
| parent | d5e094d798a20c44d442c48061c9e314a26c20c4 (diff) | |
| parent | a79858049e3b00b13879e79f4379d9e90de775f4 (diff) | |
| download | mariadb-git-cacaef6e44ed2fb7a42f5d3bfc713877a138a280.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
client/mysqldump.c:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/rpl_timezone.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysys/my_thr_init.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
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 038d743ec77..b0b7afc6528 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; } |