database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity

references lp:1011983

Browse Source 
Merged latest MariaDB development in: bzr merge lp:maria/5.5
=> 
Text conflict in CMakeLists.txt
Text conflict in sql/handler.h
Text conflict in support-files/CMakeLists.txt
3 conflicts
This commit is contained in:
Seppo Jaakola
2012-06-12 16:34:18 +03:00
parent 33ffe0dd29 9892ace475
commit b96af9a3ab
512 changed files with 5116 additions and 5794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_truncate.cc
View File

@@ -361,12 +361,12 @@ bool Truncate_statement::lock_table(THD *thd, TABLE_LIST *table_ref,
{
DEBUG_SYNC(thd, "upgrade_lock_for_truncate");
/* To remove the table from the cache we need an exclusive lock. */
if (wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN))
if (wait_while_table_is_used(thd, table, HA_EXTRA_PREPARE_FOR_DROP))
DBUG_RETURN(TRUE);
m_ticket_downgrade= table->mdl_ticket;
/* Close if table is going to be recreated. */
if (*hton_can_recreate)
close_all_tables_for_name(thd, table->s, FALSE);
close_all_tables_for_name(thd, table->s, HA_EXTRA_NOT_USED);
}
else
{