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 | |
| parent | 7b168d0db69af2b5c555f91197fbb1d56592e6aa (diff) | |
| parent | b417300c9aadeca5d5a0e45af27c398fc57c34a2 (diff) | |
| download | mariadb-git-1397985d53b575ed51b51568a12695949ab00698.tar.gz | |
Merge next-4248 -> next-4284-merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mdl.h | 2 | ||||
| -rw-r--r-- | sql/sql_base.cc | 4 |
2 files changed, 1 insertions, 5 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 { diff --git a/sql/sql_base.cc b/sql/sql_base.cc index e1f6d9005f5..8333f0a03c7 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4996,8 +4996,6 @@ retry: while ((error= open_table(thd, table_list, thd->mem_root, &ot_ctx, 0)) && ot_ctx.can_recover_from_failed_open()) { - /* We never have an open HANDLER, LOCK TABLES or GRL here. */ - DBUG_ASSERT(thd->mdl_context.trans_sentinel() == NULL); /* Even though we have failed to open table we still need to call release_transactional_locks() to release metadata locks which @@ -5048,8 +5046,6 @@ retry: close_thread_tables(thd); table_list->table= NULL; table_list->mdl_request.ticket= NULL; - /* We never have an open HANDLER, LOCK TABLES or GRL here. */ - DBUG_ASSERT(thd->mdl_context.trans_sentinel() == NULL); thd->mdl_context.rollback_to_savepoint(ot_ctx.start_of_statement_svp()); goto retry; } |