diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-07-31 12:03:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-07-31 12:03:20 +0200 |
| commit | 8867a499f768b52d6ec2e774a1b6360e20ccafbe (patch) | |
| tree | 888db5b21adec36f8811cff997234e8a8192b43b /sql/sp_head.cc | |
| parent | de4a3c2a1dd82561a7ef53e3edd812265bd267b2 (diff) | |
| download | mariadb-git-8867a499f768b52d6ec2e774a1b6360e20ccafbe.tar.gz | |
MDEV-6050 MySQL Bug#13036505 62540: TABLE LOCKS WITHIN STORED FUNCTIONS ARE BACK IN 5.5 WITH MIXED AND ROW BI
cherry-pick revno 4053
committer: Gopal Shankar <gopal.shankar@oracle.com>
branch nick: sf_mysql-5.6
timestamp: Fri 2012-07-20 12:25:34 +0530
message:
Bug#13036505 62540: TABLE LOCKS WITHIN STORED FUNCTIONS ARE BACK IN
5.5 WITH MIXED AND ROW BI.
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index d51242c56bc..366679a2fb0 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -2323,6 +2323,11 @@ sp_head::restore_lex(THD *thd) */ if (sp_update_sp_used_routines(&m_sroutines, &sublex->sroutines)) DBUG_RETURN(TRUE); + + /* If this substatement is a update query, then mark MODIFIES_DATA */ + if (is_update_query(sublex->sql_command)) + m_flags|= MODIFIES_DATA; + /* Merge tables used by this statement (but not by its functions or procedures) to multiset of tables used by this routine. |