diff options
| author | unknown <dlenev@mysql.com> | 2005-07-09 22:04:18 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-07-09 22:04:18 +0400 |
| commit | eef5f17bde32a703a1c34fea2607805a128be42d (patch) | |
| tree | a5f776a966cf0d153d69ffe3d90f3c7513a727c3 /sql/item_func.cc | |
| parent | de1254ad792fe54b033ba106979db9854de2f976 (diff) | |
| parent | 14b1f91ba4aa9a4d950450b513d167b221ce6f6d (diff) | |
| download | mariadb-git-eef5f17bde32a703a1c34fea2607805a128be42d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg8406
mysql-test/r/sp.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
mysql-test/r/sp-error.result:
Manual merge.
mysql-test/t/sp-error.test:
Manual merge.
sql/sp_head.cc:
Manual merge.
sql/sql_yacc.yy:
Manual merge.
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index db78c811eb9..7576bca6701 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4725,6 +4725,7 @@ Item_func_sp::cleanup() delete result_field; result_field= NULL; } + m_sp= NULL; Item_func::cleanup(); } |