summaryrefslogtreecommitdiff
path: root/sql/lock.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2009-10-15 23:38:29 +0200
committerunknown <knielsen@knielsen-hq.org>2009-10-15 23:38:29 +0200
commit6aad537a6aa1381b73e87e53a5a17eda4ef1d452 (patch)
tree9366ff2dea102dc28d90ffad1cf8dff3039650e0 /sql/lock.cc
parent8ea19fa73e86a3c27917a92affd6a9e43763c7ce (diff)
parentc7d32876f345785580a7cf286542ccf390b4e1fa (diff)
downloadmariadb-git-6aad537a6aa1381b73e87e53a5a17eda4ef1d452.tar.gz
Merge MySQL 5.1.39 into MariaDB 5.1.
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 e75186d276e..d0076a49232 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