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/sql_base.h | |
| 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/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 61442843a39..8a0a1e42500 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -136,7 +136,8 @@ TABLE *find_write_locked_table(TABLE *list, const char *db, const char *table_name); thr_lock_type read_lock_type_for_table(THD *thd, Query_tables_list *prelocking_ctx, - TABLE_LIST *table_list); + TABLE_LIST *table_list, + bool routine_modifies_data); my_bool mysql_rm_tmp_tables(void); bool rm_temporary_table(handlerton *base, const char *path); |