diff options
| author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-12-05 14:08:19 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-12-05 14:08:19 +0400 |
| commit | 3eafe5cf98b0fc2a1e58305578829799d28d482c (patch) | |
| tree | dd0cd34a72ea20f211dbbf68eace37e323285c7f /sql/sql_parse.cc | |
| parent | d553728bfbf4ea4cbdf0532326c4873f4cdcae78 (diff) | |
| parent | 4474cc8493fb999b1fea4da739177c146909ddef (diff) | |
| download | mariadb-git-3eafe5cf98b0fc2a1e58305578829799d28d482c.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b22645
into mysql.com:/usr/home/bar/mysql-5.0.b22645
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/log.cc:
Removing one_shot from 5.0.
sql/sql_locale.cc:
After merge fix
sql/set_var.cc:
After merge fix
sql/set_var.h:
After merge fix
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 e3ee9f340cf..ac7dc8ec46a 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2383,6 +2383,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; } |