database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mysql.com:/usr/home/bar/mysql-4.1.b22645

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.0.b22645
This commit is contained in:
bar@mysql.com/bar.intranet.mysql.r18.ru
2006-12-05 14:08:19 +04:00
parent 153c57fa13 224660d14a
commit 58149eaf61
9 changed files with 1411 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_parse.cc
View File

@@ -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;
}