Commit f09b4b96 authored by konstantin@mysql.com's avatar konstantin@mysql.com

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  mysql.com:/opt/local/work/mysql-5.0-11172-new
parents b46b232f 402df62b
...@@ -2447,6 +2447,7 @@ Prepared_statement::~Prepared_statement() ...@@ -2447,6 +2447,7 @@ Prepared_statement::~Prepared_statement()
if (cursor) if (cursor)
cursor->Cursor::~Cursor(); cursor->Cursor::~Cursor();
free_items(); free_items();
free_root(cursor->mem_root, MYF(0));
delete lex->result; delete lex->result;
} }
......
...@@ -1920,7 +1920,6 @@ Cursor::~Cursor() ...@@ -1920,7 +1920,6 @@ Cursor::~Cursor()
{ {
if (is_open()) if (is_open())
close(FALSE); close(FALSE);
free_root(mem_root, MYF(0));
} }
/*********************************************************************/ /*********************************************************************/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment