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:/home/bkroot/mysql-5.0-rpl

Browse Source 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
This commit is contained in:
lars@mysql.com/black.(none)
2006-12-08 23:33:39 +01:00
parent 94eb027f6b c82cd4a46e
commit e2e3f0e5c3
36 changed files with 2686 additions and 1047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_parse.cc
View File

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