Commit 07f1b8d7 authored by Anel Husakovic's avatar Anel Husakovic Committed by Sergei Golubchik

Cosmetic fixes

Reviewer: <vicentiu@mariadb.org>
parent 056c83cc
...@@ -4331,9 +4331,7 @@ lock_table_names(THD *thd, const DDL_options_st &options, ...@@ -4331,9 +4331,7 @@ lock_table_names(THD *thd, const DDL_options_st &options,
table->mdl_request.type == MDL_SHARED_READ_ONLY || table->mdl_request.type == MDL_SHARED_READ_ONLY ||
table->open_type == OT_TEMPORARY_ONLY || table->open_type == OT_TEMPORARY_ONLY ||
(table->open_type == OT_TEMPORARY_OR_BASE && is_temporary_table(table))) (table->open_type == OT_TEMPORARY_OR_BASE && is_temporary_table(table)))
{
continue; continue;
}
/* Write lock on normal tables is not allowed in a read only transaction. */ /* Write lock on normal tables is not allowed in a read only transaction. */
if (thd->tx_read_only) if (thd->tx_read_only)
......
...@@ -8007,7 +8007,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, ...@@ -8007,7 +8007,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
ptr->select_lex= this; ptr->select_lex= this;
/* /*
We can't cache internal temporary tables between prepares as the We can't cache internal temporary tables between prepares as the
table may be deleted before next exection. table may be deleted before next execution.
*/ */
ptr->cacheable_table= !table->is_derived_table(); ptr->cacheable_table= !table->is_derived_table();
ptr->index_hints= index_hints_arg; ptr->index_hints= index_hints_arg;
...@@ -8028,8 +8028,8 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, ...@@ -8028,8 +8028,8 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
!cmp(&ptr->db, &tables->db)) && !cmp(&ptr->db, &tables->db)) &&
!tables->sequence)) !tables->sequence))
{ {
my_error(ER_NONUNIQ_TABLE, MYF(0), alias_str.str); /* purecov: tested */ my_error(ER_NONUNIQ_TABLE, MYF(0), alias_str.str); /* purecov: tested */
DBUG_RETURN(0); /* purecov: tested */ DBUG_RETURN(0); /* purecov: tested */
} }
} }
} }
......
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