Commit d81f0574 authored by unknown's avatar unknown
Browse files

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

sql/sql_prepare.cc

+1 −0
Original line number Diff line number Diff line
@@ -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;

}

sql/sql_select.cc

+0 −1
Original line number Diff line number Diff line
@@ -1920,7 +1920,6 @@ Cursor::~Cursor() 
{

  if (is_open())

    close(FALSE);

  free_root(mem_root, MYF(0));

}



/*********************************************************************/