database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

cleanup: remove redundant if()

Browse Source 
likely, a result of auto-merge of two fixes in different versions
This commit is contained in:
Sergei Golubchik
2024-09-27 12:58:15 +02:00
parent 813e592763
commit b1bbdbab9e
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_select.cc
View File

@ -13904,13 +13904,6 @@ void JOIN_TAB::cleanup()
delete filesort->select;
delete filesort;
filesort= NULL;
/* Skip non-existing derived tables/views result tables */
if (table &&
(table->s->tmp_table != INTERNAL_TMP_TABLE || table->is_created()))
{
table->file->ha_end_keyread();
table->file->ha_index_or_rnd_end();
}
if (table)
{
table->file->ha_end_keyread();
@ -13919,8 +13912,7 @@ void JOIN_TAB::cleanup()
else
table->file->ha_index_or_rnd_end();
preread_init_done= FALSE;
if (table->pos_in_table_list &&
table->pos_in_table_list->jtbm_subselect)
if (table->pos_in_table_list && table->pos_in_table_list->jtbm_subselect)
{
if (table->pos_in_table_list->jtbm_subselect->is_jtbm_const_tab)
{

12
storage/innobase/handler/ha_innodb.cc
View File

@ -15929,10 +15929,10 @@ ha_innobase::external_lock(
}
DBUG_RETURN(0);
} else {
DEBUG_SYNC_C("ha_innobase_end_statement");
}
DEBUG_SYNC_C("ha_innobase_end_statement");
/* MySQL is releasing a table lock */
trx->n_mysql_tables_in_use--;
@ -15959,14 +15959,6 @@ ha_innobase::external_lock(
}
}
if (!trx_is_started(trx)
&& lock_type != F_UNLCK
&& (m_prebuilt->select_lock_type != LOCK_NONE
|| m_prebuilt->stored_select_lock_type != LOCK_NONE)) {
trx->will_lock = true;
}
DBUG_RETURN(0);
}