summaryrefslogtreecommitdiff
path: root/sql/lock.cc
diff options
context:
space:
mode:
authorunknown <davi@moksha.local>2007-08-17 17:11:08 -0300
committerunknown <davi@moksha.local>2007-08-17 17:11:08 -0300
commit2fe97615d0db5e4c9e0e5733581710b0bc089619 (patch)
tree4fbb4fdedadb853b8f59ba4e8d6591607cb649fb /sql/lock.cc
parentf0c26a9763573425cd3b1e64daec570eee4359f5 (diff)
downloadmariadb-git-2fe97615d0db5e4c9e0e5733581710b0bc089619.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. 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 f859f028504..d9e9dd31f81 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -857,6 +857,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;