database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Automerge with 5.1

Browse Source
This commit is contained in:
Michael Widenius
2010-08-25 01:44:50 +03:00
parent 99b79db5dc a826711789
commit 58a75bb18b
167 changed files with 1625 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/log.cc
View File

@ -372,6 +372,7 @@ bool Log_to_csv_event_handler::
Open_tables_state open_tables_backup;
ulonglong save_thd_options;
bool save_time_zone_used;
DBUG_ENTER("log_general");
/*
CSV uses TIME_to_timestamp() internally if table needs to be repaired
@ -490,7 +491,7 @@ err:
thd->options= save_thd_options;
thd->time_zone_used= save_time_zone_used;
return result;
DBUG_RETURN(result);
}