diff options
author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 18:12:39 +0300 |
---|---|---|
committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 18:12:39 +0300 |
commit | 1397985d53b575ed51b51568a12695949ab00698 (patch) | |
tree | 5cefaae7a24b78997b8699c785258ef6ec1807f1 /sql/mdl.h | |
parent | 7b168d0db69af2b5c555f91197fbb1d56592e6aa (diff) | |
parent | b417300c9aadeca5d5a0e45af27c398fc57c34a2 (diff) | |
download | mariadb-git-1397985d53b575ed51b51568a12695949ab00698.tar.gz |
Merge next-4248 -> next-4284-merge
Diffstat (limited to 'sql/mdl.h')
-rw-r--r-- | sql/mdl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mdl.h b/sql/mdl.h index 5eb86d2488b..24331cf5eac 100644 --- a/sql/mdl.h +++ b/sql/mdl.h @@ -540,7 +540,7 @@ public: always re-try reading it after small timeout and therefore will see the new value eventually. */ - m_needs_thr_lock_abort= TRUE; + m_needs_thr_lock_abort= needs_thr_lock_abort; } bool get_needs_thr_lock_abort() const { |