database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Cosmetic fixes

Browse Source 
Reviewer: <vicentiu@mariadb.org>
This commit is contained in:
Anel Husakovic
2023-06-07 13:33:10 +02:00
committed by Sergei Golubchik
parent f329fe1c23
commit 1c052e9011
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_base.cc
View File

@@ -4339,9 +4339,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)

6
sql/sql_parse.cc
View File

@@ -8038,7 +8038,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;
@@ -8059,8 +8059,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 */
} }
} }
} }