Commit 80618e72 authored by davi@moksha.local's avatar davi@moksha.local
Browse files

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

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

sql/sql_insert.cc

+4 −2
Original line number Diff line number Diff line
@@ -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)