diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2008-10-09 20:57:41 +0500 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2008-10-09 20:57:41 +0500 |
| commit | 0c20c0f12ff15601e23bd45bcda70317a59d9380 (patch) | |
| tree | 31d8d391b64b679bf2edfbcefbde5f071fb5e59c /sql/sql_union.cc | |
| parent | d9df61cc1d91f04a87abafb19fdd7ebf3039d084 (diff) | |
| parent | a83f5b18efaa54df3b56c86c1ab9244280447f24 (diff) | |
| download | mariadb-git-0c20c0f12ff15601e23bd45bcda70317a59d9380.tar.gz | |
manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 5f7e3c5b620..2f3282f58f6 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -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. |