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

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

into  moksha.local:/Users/davi/mysql/push/bugs/21136-regression
parents b3ca7307 f3b6d56f
Branches unavailable
Tags unavailable
No related merge requests found
......@@ -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)
......
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