diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-10 02:18:22 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-10 02:18:22 +0200 |
| commit | ecb11989ad22af2cdd2359dbb96705af240f1c84 (patch) | |
| tree | 21cf400810b87c400f5ed2f7d7390f4306d5af14 /sql/sql_union.cc | |
| parent | d4767576f8b1f3ddf0ae6785b0fa785f06c2e536 (diff) | |
| download | mariadb-git-ecb11989ad22af2cdd2359dbb96705af240f1c84.tar.gz | |
after merge & valgrind test fixes (BUG#2120)
sql/sql_derived.cc:
memory leack fixed
sql/sql_lex.cc:
flag to avoid double cleaning
sql/sql_lex.h:
flag to avoid double cleaning
sql/sql_select.cc:
right way to cleanup JOIN_TAB
sql/sql_select.h:
right way to cleanup JOIN_TAB
sql/sql_union.cc:
flag to avoid double cleaning
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 226086d0d24..75fd9be88bd 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -442,6 +442,12 @@ int st_select_lex_unit::cleanup() int error= 0; DBUG_ENTER("st_select_lex_unit::cleanup"); + if (cleaned) + { + DBUG_RETURN(0); + } + cleaned= 0; + if (union_result) { delete union_result; |