database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

post merge fixes

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2005-03-08 22:59:21 +02:00
parent d6b9e709bf f066f4db83
commit b2c77c1c9c
5 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -3191,7 +3191,7 @@ unsent_create_error:
Don't allow this within a transaction because we want to use
re-generate table
*/
if (thd->locked_tables || thd->active_transaction())
if ((thd->locked_tables && !lex->sphead) || thd->active_transaction())
{
my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));