summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authortsmith@quadxeon.mysql.com <>2007-06-05 23:04:40 +0200
committertsmith@quadxeon.mysql.com <>2007-06-05 23:04:40 +0200
commitd2fe24d1ef367483ff6cf775f9f151734933bf32 (patch)
treebe4ad3f767cede727abc63a97dde0d92d211f27b /sql/set_var.cc
parent173d07de7806abfce4ccc51e6d16686b2e60dcd2 (diff)
parentd9fcc304d9b02b97bc259dc74d3b33f44885258d (diff)
downloadmariadb-git-d2fe24d1ef367483ff6cf775f9f151734933bf32.tar.gz
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index b9ab14612a3..09cdc34f803 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1226,7 +1226,11 @@ static void sys_default_ftb_syntax(THD *thd, enum_var_type type)
static void fix_low_priority_updates(THD *thd, enum_var_type type)
{
- if (type != OPT_GLOBAL)
+ if (type == OPT_GLOBAL)
+ thr_upgraded_concurrent_insert_lock=
+ (global_system_variables.low_priority_updates ?
+ TL_WRITE_LOW_PRIORITY : TL_WRITE);
+ else
thd->update_lock_default= (thd->variables.low_priority_updates ?
TL_WRITE_LOW_PRIORITY : TL_WRITE);
}