summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2019-12-18 12:56:54 +0300
committerSergei Petrunia <psergey@askmonty.org>2019-12-18 12:56:54 +0300
commit8b9db11718af0c61e8d3cdbb634cf273b8998f98 (patch)
tree68b5258a3defae139a05ae767112062a8f984015
parent0ac0bc8cb6ac1f9b2611da63d9e06095571422fe (diff)
downloadmariadb-git-8b9db11718af0c61e8d3cdbb634cf273b8998f98.tar.gz
MDEV-21341: Fix optimizer-related UBSAN failures, part #2
Remove Query_tables_list::lock_tables_state - it is not used and it causes errors like this: sql_lex.h:1675:7: runtime error: load of value 2779096485, which is not a valid value for type 'enum_lock_tables_state'
-rw-r--r--sql/sql_lex.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 4462d541e5f..cdf80daa928 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -1191,28 +1191,6 @@ public:
uint sroutines_list_own_elements;
/**
- Locking state of tables in this particular statement.
-
- If we under LOCK TABLES or in prelocked mode we consider tables
- for the statement to be "locked" if there was a call to lock_tables()
- (which called handler::start_stmt()) for tables of this statement
- and there was no matching close_thread_tables() call.
-
- As result this state may differ significantly from one represented
- by Open_tables_state::lock/locked_tables_mode more, which are always
- "on" under LOCK TABLES or in prelocked mode.
- */
- enum enum_lock_tables_state {
- LTS_NOT_LOCKED = 0,
- LTS_LOCKED
- };
- enum_lock_tables_state lock_tables_state;
- bool is_query_tables_locked()
- {
- return (lock_tables_state == LTS_LOCKED);
- }
-
- /**
Number of tables which were open by open_tables() and to be locked
by lock_tables().
Note that we set this member only in some cases, when this value