Commit d81f0574 authored by unknown's avatar unknown

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

into  mysql.com:/opt/local/work/mysql-5.0-11172-new


sql/sql_select.cc:
  Auto merged
parents 120a2da1 b32d2ac2
......@@ -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));
}
/*********************************************************************/
......
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