From d13302ff6013acee9ac5fb6946d0c91e2f303224 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 16 Dec 2018 18:22:35 +0100 Subject: cleanup: small simplification --- sql/temporary_tables.cc | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) (limited to 'sql/temporary_tables.cc') diff --git a/sql/temporary_tables.cc b/sql/temporary_tables.cc index 87c4671ada4..a4ece127f96 100644 --- a/sql/temporary_tables.cc +++ b/sql/temporary_tables.cc @@ -1032,39 +1032,21 @@ TABLE *THD::find_temporary_table(const char *key, uint key_length, /* A matching TMP_TABLE_SHARE is found. */ All_share_tables_list::Iterator tables_it(share->all_tmp_tables); - while ((table= tables_it++)) + bool found= false; + while (!found && (table= tables_it++)) { switch (state) { - case TMP_TABLE_IN_USE: - if (table->query_id > 0) - { - result= table; - goto done; - } - break; - case TMP_TABLE_NOT_IN_USE: - if (table->query_id == 0) - { - result= table; - goto done; - } - break; - case TMP_TABLE_ANY: - { - result= table; - goto done; - } - break; - default: /* Invalid */ - DBUG_ASSERT(0); - goto done; + case TMP_TABLE_IN_USE: found= table->query_id > 0; break; + case TMP_TABLE_NOT_IN_USE: found= table->query_id == 0; break; + case TMP_TABLE_ANY: found= true; break; } } + result= table; + break; } } -done: if (locked) { DBUG_ASSERT(m_tmp_tables_locked); -- cgit v1.2.1