Merge moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
into moksha.local:/Users/davi/mysql/push/bugs/21136-regression
This commit is contained in:
commit
80618e723e
@ -3653,7 +3653,8 @@ bool select_create::send_eof()
|
|||||||
if (m_plock)
|
if (m_plock)
|
||||||
{
|
{
|
||||||
mysql_unlock_tables(thd, *m_plock);
|
mysql_unlock_tables(thd, *m_plock);
|
||||||
m_plock= 0;
|
*m_plock= NULL;
|
||||||
|
m_plock= NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return tmp;
|
return tmp;
|
||||||
@ -3691,7 +3692,8 @@ void select_create::abort()
|
|||||||
if (m_plock)
|
if (m_plock)
|
||||||
{
|
{
|
||||||
mysql_unlock_tables(thd, *m_plock);
|
mysql_unlock_tables(thd, *m_plock);
|
||||||
m_plock= 0;
|
*m_plock= NULL;
|
||||||
|
m_plock= NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (table)
|
if (table)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user