diff options
| author | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2007-01-17 19:28:55 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2007-01-17 19:28:55 +0100 |
| commit | 158b0603f34247e7e450bf737c0092e9d7c3f868 (patch) | |
| tree | e58fd5fe8f5124437cd72eae71eefd71a98a229c /sql/sql_parse.cc | |
| parent | f7e41baedbaf246e68936c1fbb105b75bf28ae44 (diff) | |
| parent | 6dc02026171c61eaae4cab9998b4d928da65e5e3 (diff) | |
| download | mariadb-git-158b0603f34247e7e450bf737c0092e9d7c3f868.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
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 6e1a8ba3abc..f3f1041774c 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1958,6 +1958,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; } |