summaryrefslogtreecommitdiff
path: root/sql/lock.cc
diff options
context:
space:
mode:
authorunknown <davi@moksha.local>2007-08-16 14:51:37 -0300
committerunknown <davi@moksha.local>2007-08-16 14:51:37 -0300
commit409938f22a6b383bc987a4463aef60483f458394 (patch)
treec6387b21af93f5dbd4171e67e74b4490d4e7996e /sql/lock.cc
parenta0ed0ea12870e87316f9086b8a1152eb6c4c2b8b (diff)
downloadmariadb-git-409938f22a6b383bc987a4463aef60483f458394.tar.gz
Bug#29936 (Stored Procedure DML ignores low_priority_updates setting)
This is a follow up for the patch for Bug#26162 "Trigger DML ignores low_priority_updates setting", where the stored procedure ignores the session setting of low_priority_updates. For every table open operation with default write (TL_WRITE_DEFAULT) lock_type, downgrade the lock type to the session setting of low_priority_updates. sql/lock.cc: Add late lock_type assertion. sql/sql_base.cc: Possibly downgrade lock type to the the session setting of low_priority_updates and also remove early assertion.
Diffstat (limited to 'sql/lock.cc')
-rw-r--r--sql/lock.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/lock.cc b/sql/lock.cc
index f730ac56d35..0036d0aef77 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -730,6 +730,7 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count,
if ((table=table_ptr[i])->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE)
continue;
lock_type= table->reginfo.lock_type;
+ DBUG_ASSERT (lock_type != TL_WRITE_DEFAULT);
if (lock_type >= TL_WRITE_ALLOW_WRITE)
{
*write_lock_used=table;