1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

merge from mysql-trunk-bugfixing

This commit is contained in:
Jon Olav Hauglid
2010-05-05 09:25:04 +02:00
223 changed files with 5520 additions and 5258 deletions

View File

@@ -5530,7 +5530,7 @@ void THD::reset_for_next_command()
thd->transaction.all.modified_non_trans_table= FALSE;
}
DBUG_ASSERT(thd->security_ctx== &thd->main_security_ctx);
thd->thread_specific_used= FALSE;
thd->thread_specific_used= thd->thread_temporary_used= FALSE;
if (opt_bin_log)
{