From: Dmitry Shulga Date: December 9 2010 2:27pm Subject: Re: bzr commit into mysql-5.1-bugteam branch (Dmitry.Shulga:3511) Bug#54486 List-Archive: http://lists.mysql.com/commits/126429 Message-Id: <2D412A49-33F7-4D98-8E19-2A591E097F57@oracle.com> MIME-Version: 1.0 (Apple Message framework v1082) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit On 09.12.2010, at 16:06, Sergey Vojtovich wrote: > Hi Dmitry, > > ok to push, but there are a few minor suggestions inline. > >> @ sql/sql_db.cc >> mysql_rm_known_files() modified: ignore possible errors >> when trying delete all table's files. Such aggressigve >> algorithm permits skip already deleted (in another thread) >> files. > Hmm... it doesn't sound up to date. Why do you think so? > >> + DBUG_ASSERT(deleted >= 0 || >> + (deleted < 0 && thd->main_da.is_set()) || >> + thd->killed); >> + > It makes me think that: > - diagnostics area state is irrelevant when deleted >= 0; > - diagnostics area state is irrelevant (though it must be non-empty) > when deleted < 0; > - diagnostics area state as well as deleted state is irrelevant > when thd->killed. > > It confuses me, but I can leave with it. So I can only hope that all > points above are acceptable. Ok. I think your arguments are right, I will remove this assert. >> - if (thd->killed || >> - (tot_list && mysql_rm_table_part2(thd, tot_list, 1, 0, 1, 1))) >> + >> + if (thd->killed) >> goto err; >> >> + if (tot_list) >> + { >> + int res= 0; >> + { > Why extra level of braces and indentation? Removed.