database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc

Browse Source
This commit is contained in:
Gleb Shchepa
2008-10-08 02:52:49 +05:00
parent 01f8be17dd e219979e7d
commit e05be97a75
9 changed files with 202 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_update.cc
View File

@ -1076,11 +1076,14 @@ reopen_tables:
}
/* now lock and fill tables */
if (lock_tables(thd, table_list, table_count, &need_reopen))
if (!thd->stmt_arena->is_stmt_prepare() &&
lock_tables(thd, table_list, table_count, &need_reopen))
{
if (!need_reopen)
DBUG_RETURN(TRUE);
DBUG_PRINT("info", ("lock_tables failed, reopening"));
/*
We have to reopen tables since some of them were altered or dropped
during lock_tables() or something was done with their triggers.
@ -1096,6 +1099,14 @@ reopen_tables:
for (TABLE_LIST *tbl= table_list; tbl; tbl= tbl->next_global)
tbl->cleanup_items();
/*
Also we need to cleanup Natural_join_column::table_field items.
To not to traverse a join tree we will cleanup whole
thd->free_list (in PS execution mode that list may not contain
items from 'fields' list, so the cleanup above is necessary to.
*/
cleanup_items(thd->free_list);
close_tables_for_reopen(thd, &table_list);
goto reopen_tables;
}