From: Date: November 1 2007 4:33pm Subject: bk commit into 5.1 tree (kostja:1.2602) BUG#12713 List-Archive: http://lists.mysql.com/commits/36896 X-Bug: 12713 Message-Id: <20071101153357.A820D1B023@vajra.local> Below is the list of changes that have just been committed into a local 5.1 repository of kostja. When kostja does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-11-01 18:33:51+03:00, kostja@bodhi.(none) +1 -0 Cleanup execute_ddl_log_recovery() to not generate an error if there is nothing to recover. Discovered while working on Bug#12713 sql/sql_table.cc@stripped, 2007-11-01 18:33:49+03:00, kostja@bodhi.(none) +1 -1 Use MYF(0) in my_open() in read_ddl_log_header() called from execute_ddl_log_recovery() called during the server start up to not generate an error if no ddl log exists. This is not an erroneous situation, in fact it's the case in any server statrtup. The error was lost anyway, since it was pushed into the stack of the artificial thd. diff -Nrup a/sql/sql_table.cc b/sql/sql_table.cc --- a/sql/sql_table.cc 2007-10-31 06:53:20 +03:00 +++ b/sql/sql_table.cc 2007-11-01 18:33:49 +03:00 @@ -434,7 +434,7 @@ static uint read_ddl_log_header() create_ddl_log_file_name(file_name); if ((global_ddl_log.file_id= my_open(file_name, - O_RDWR | O_BINARY, MYF(MY_WME))) >= 0) + O_RDWR | O_BINARY, MYF(0))) >= 0) { if (read_ddl_log_file_entry(0UL)) {