database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl

Browse Source 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
This commit is contained in:
lars/lthalmann@mysql.com/dl145j.mysql.com
2007-01-12 12:21:44 +01:00
parent 12cd7c7b3e 587330f125
commit 22398faa91
16 changed files with 1484 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_parse.cc
View File

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