database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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-09 20:57:41 +05:00
parent d9df61cc1d a83f5b18ef
commit 0c20c0f12f
4 changed files with 239 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_union.cc
View File

@ -399,7 +399,6 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
}
else
{
DBUG_ASSERT(!thd->stmt_arena->is_conventional());
/*
We're in execution of a prepared statement or stored procedure:
reset field items to point at fields from the created temporary table.