Merge mysql.com:/usr/local/bk/mysql-5.0

into mysql.com:/home/pem/work/mysql-5.0

Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
549399ee · pem@mysql.com · 9f1bb68b · 88603a0e · 549399ee
Commit 549399ee authored Jul 01, 2005 by pem@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/sql_prepare.cc sql/sql_prepare.cc +2 -1

No files found.
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -2447,7 +2447,8 @@ Prepared_statement::~Prepared_statement()
  if (cursor)
    cursor->Cursor::~Cursor();
  free_items();
-  free_root(cursor->mem_root, MYF(0));
+  if (cursor)
+    free_root(cursor->mem_root, MYF(0));
  delete lex->result;
 }