summaryrefslogtreecommitdiff
path: root/sql/lock.cc
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2009-09-28 09:39:50 +0200
committerMikael Ronstrom <mikael@mysql.com>2009-09-28 09:39:50 +0200
commitccae404afaddf98c16889fdd21c613b551ee5e5e (patch)
treef7dc27f11e200c4a174df0a91afb7bbd83e5dcc5 /sql/lock.cc
parentec5b25954376265d187c57984d0416c50d0a1694 (diff)
parenta8edd0aabb5059935b99076fbcc92403079535df (diff)
downloadmariadb-git-ccae404afaddf98c16889fdd21c613b551ee5e5e.tar.gz
Merge to mysql-next-mr
Diffstat (limited to 'sql/lock.cc')
-rw-r--r--sql/lock.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/lock.cc b/sql/lock.cc
index 322778b89c3..93d8b868688 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -1472,11 +1472,10 @@ void unlock_global_read_lock(THD *thd)
bool wait_if_global_read_lock(THD *thd, bool abort_on_refresh,
bool is_not_commit)
{
- const char *old_message;
+ const char *UNINIT_VAR(old_message);
bool result= 0, need_exit_cond;
DBUG_ENTER("wait_if_global_read_lock");
- LINT_INIT(old_message);
/*
Assert that we do not own LOCK_open. If we would own it, other
threads could not close their tables. This would make a pretty