Merge moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime

into moksha.local:/Users/davi/mysql/push/bugs/21136-regression

Merge moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
into moksha.local:/Users/davi/mysql/push/bugs/21136-regression
842fe93b · unknown · ee7f61ab · 1241a9da · 842fe93b
Commit 842fe93b authored Sep 29, 2007 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

sql/sql_insert.cc sql/sql_insert.cc +4 -2

No files found.
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -3653,7 +3653,8 @@ bool select_create::send_eof()
    if (m_plock)
    {
      mysql_unlock_tables(thd, *m_plock);
-      m_plock= 0;
+      *m_plock= NULL;
+      m_plock= NULL;
    }
  }
  return tmp;
@@ -3691,7 +3692,8 @@ void select_create::abort()
  if (m_plock)
  {
    mysql_unlock_tables(thd, *m_plock);
-    m_plock= 0;
+    *m_plock= NULL;
+    m_plock= NULL;
  }

  if (table)