mirror of
https://github.com/MariaDB/server.git
synced 2026-05-10 00:54:30 +02:00
Post-review fix for BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers
mysql-test/r/sp.result: Added missing drop table. mysql-test/t/sp.test: Added missing drop table. sql/sp_head.h: Post-review fix for autocommit check in SPs and triggers. sql/sql_yacc.yy: Post-review fix for autocommit check in SPs and triggers.
This commit is contained in:
parent
38c43ecdd3
commit
8c86f8e4bf
4 changed files with 12 additions and 10 deletions
|
|
@ -285,7 +285,8 @@ public:
|
|||
my_error(ER_SP_NO_RETSET, MYF(0), where);
|
||||
else if (m_flags & HAS_SET_AUTOCOMMIT_STMT)
|
||||
my_error(ER_SP_CANT_SET_AUTOCOMMIT, MYF(0));
|
||||
return test(m_flags & (CONTAINS_DYNAMIC_SQL|MULTI_RESULTS));
|
||||
return test(m_flags &
|
||||
(CONTAINS_DYNAMIC_SQL|MULTI_RESULTS|HAS_SET_AUTOCOMMIT_STMT));
|
||||
}
|
||||
private:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue