Commit 6761c498 authored by unknown's avatar unknown

Correcting assertion


storage/maria/ha_maria.cc:
  start_stmt() is passed thr_lock_type (TL_*), not int F_*.
  Though tt does not seem to matter here, F_UNLCK == TL_UNLOCK == 0
  at least on Linux and Windows.
parent a6c7eb1b
...@@ -2258,7 +2258,7 @@ int ha_maria::start_stmt(THD *thd, thr_lock_type lock_type) ...@@ -2258,7 +2258,7 @@ int ha_maria::start_stmt(THD *thd, thr_lock_type lock_type)
trn= THD_TRN; trn= THD_TRN;
DBUG_ASSERT(trn); // this may be called only after external_lock() DBUG_ASSERT(trn); // this may be called only after external_lock()
DBUG_ASSERT(trnman_has_locked_tables(trn)); DBUG_ASSERT(trnman_has_locked_tables(trn));
DBUG_ASSERT(lock_type != F_UNLCK); DBUG_ASSERT(lock_type != TL_UNLOCK);
/* /*
If there was an implicit commit under this LOCK TABLES by a previous If there was an implicit commit under this LOCK TABLES by a previous
statement (like a DDL), at least if that previous statement was about a statement (like a DDL), at least if that previous statement was about a
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment