diff options
| author | unknown <tulin@dl145c.mysql.com> | 2005-09-14 13:37:52 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145c.mysql.com> | 2005-09-14 13:37:52 +0200 |
| commit | 469d7c12b804c0e29de14356b75066c58b005c76 (patch) | |
| tree | 07c0b532d9d3d9f16c7b279334a18dad3b2e7292 /sql/sql_yacc.yy | |
| parent | 59e6d10603ee77b053171832a9146010884b921d (diff) | |
| parent | 258c9e9dc7d7aa35a4f56d182761fb356946e5d0 (diff) | |
| download | mariadb-git-469d7c12b804c0e29de14356b75066c58b005c76.tar.gz | |
merge
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index d59ae054484..6a7b25dc82c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -8603,6 +8603,14 @@ internal_variable_name: if (tmp == &sys_time_zone && lex->add_time_zone_tables_to_query_tables(YYTHD)) YYABORT; + else if (spc && tmp == &sys_autocommit) + { + /* + We don't allow setting AUTOCOMMIT from a stored function + or trigger. + */ + lex->sphead->m_flags|= sp_head::HAS_SET_AUTOCOMMIT_STMT; + } } else { |