mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 11:31:51 +01:00
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-11172-new
This commit is contained in:
commit
f09b4b969c
2 changed files with 1 additions and 1 deletions
|
@ -2447,6 +2447,7 @@ Prepared_statement::~Prepared_statement()
|
|||
if (cursor)
|
||||
cursor->Cursor::~Cursor();
|
||||
free_items();
|
||||
free_root(cursor->mem_root, MYF(0));
|
||||
delete lex->result;
|
||||
}
|
||||
|
||||
|
|
|
@ -1920,7 +1920,6 @@ Cursor::~Cursor()
|
|||
{
|
||||
if (is_open())
|
||||
close(FALSE);
|
||||
free_root(mem_root, MYF(0));
|
||||
}
|
||||
|
||||
/*********************************************************************/
|
||||
|
|
Loading…
Add table
Reference in a new issue