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:
konstantin@mysql.com 2005-07-01 17:52:41 +04:00
commit f09b4b969c
2 changed files with 1 additions and 1 deletions

View file

@ -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;
}

View file

@ -1920,7 +1920,6 @@ Cursor::~Cursor()
{
if (is_open())
close(FALSE);
free_root(mem_root, MYF(0));
}
/*********************************************************************/