summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2005-06-29 11:50:29 +0300
committerunknown <bell@sanja.is.com.ua>2005-06-29 11:50:29 +0300
commitc35625416ce62a653716e761acdee97fcd56b8fd (patch)
tree6cf23b2faab7872e617525ce08f988793195fe1c /sql/sql_union.cc
parent10986dba1bba289b8d8c3eee5335b5c38519bc6a (diff)
downloadmariadb-git-c35625416ce62a653716e761acdee97fcd56b8fd.tar.gz
fixed SP parameter execution
sql/sp_head.cc: execute parameters in statement mem_root sql/sql_union.cc: additional assert
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 87b67a5127a..6e307dda5be 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -646,6 +646,7 @@ bool st_select_lex::cleanup()
if (join)
{
+ DBUG_ASSERT((st_select_lex*)join->select_lex == this);
error|= join->destroy();
delete join;
join= 0;