Push history-limiting code until after the code that adds new

history entries.  Lazy deletion isn't smart or useful here.
This commit is contained in:
cmiller@zippy.cornsilk.net 2007-10-31 12:29:32 -04:00
parent 3cf16df04f
commit 8d836dd38a

View File

@ -338,9 +338,6 @@ void PROFILING::store()
DBUG_VOID_RETURN;
}
while (history.elements > thd->variables.profiling_history_size)
delete history.pop();
if (likely(((thd)->options & OPTION_PROFILING) == 0))
DBUG_VOID_RETURN;
@ -370,6 +367,9 @@ void PROFILING::store()
if (enabled)
current= new QUERY_PROFILE(this, thd->query, thd->query_length);
while (history.elements > thd->variables.profiling_history_size)
delete history.pop();
DBUG_VOID_RETURN;
}