database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

cleanup: formatting

Browse Source 
also avoid an oxymoron of using `MYSQL_PLUGIN_IMPORT` under
`#ifdef MYSQL_SERVER`, and empty_clex_str is so trivial that a plugin
can define it if needed.
This commit is contained in:
Sergei Golubchik
2021-06-09 18:31:23 +02:00
parent 89342a3bd5
commit 3648b333c7
13 changed files with 65 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
sql/sql_base.cc
View File

@@ -4532,9 +4532,9 @@ error:
@retval TRUE Failure (OOM).
*/
bool DML_prelocking_strategy::
handle_routine(THD *thd, Query_tables_list *prelocking_ctx,
Sroutine_hash_entry *rt, sp_head *sp, bool *need_prelocking)
bool DML_prelocking_strategy::handle_routine(THD *thd,
Query_tables_list *prelocking_ctx, Sroutine_hash_entry *rt,
sp_head *sp, bool *need_prelocking)
{
/*
We assume that for any "CALL proc(...)" statement sroutines_list will
@@ -4668,8 +4668,8 @@ prepare_fk_prelocking_list(THD *thd, Query_tables_list *prelocking_ctx,
// FK_OPTION_RESTRICT and FK_OPTION_NO_ACTION only need read access
thr_lock_type lock_type;
if ((op & (1 << TRG_EVENT_DELETE) && fk_modifies_child(fk->delete_method))
|| (op & (1 << TRG_EVENT_UPDATE) && fk_modifies_child(fk->update_method)))
if ((op & trg2bit(TRG_EVENT_DELETE) && fk_modifies_child(fk->delete_method))
|| (op & trg2bit(TRG_EVENT_UPDATE) && fk_modifies_child(fk->update_method)))
lock_type= TL_WRITE_ALLOW_WRITE;
else
lock_type= TL_READ;
@@ -4715,9 +4715,9 @@ prepare_fk_prelocking_list(THD *thd, Query_tables_list *prelocking_ctx,
@retval TRUE Failure (OOM).
*/
bool DML_prelocking_strategy::
handle_table(THD *thd, Query_tables_list *prelocking_ctx,
TABLE_LIST *table_list, bool *need_prelocking)
bool DML_prelocking_strategy::handle_table(THD *thd,
Query_tables_list *prelocking_ctx, TABLE_LIST *table_list,
bool *need_prelocking)
{
DBUG_ENTER("handle_table");
TABLE *table= table_list->table;
@@ -4846,9 +4846,9 @@ err:
@retval TRUE Failure (OOM).
*/
bool DML_prelocking_strategy::
handle_view(THD *thd, Query_tables_list *prelocking_ctx,
TABLE_LIST *table_list, bool *need_prelocking)
bool DML_prelocking_strategy::handle_view(THD *thd,
Query_tables_list *prelocking_ctx, TABLE_LIST *table_list,
bool *need_prelocking)
{
if (table_list->view->uses_stored_routines())
{
@@ -4886,9 +4886,9 @@ handle_view(THD *thd, Query_tables_list *prelocking_ctx,
@retval TRUE Failure (OOM).
*/
bool Lock_tables_prelocking_strategy::
handle_table(THD *thd, Query_tables_list *prelocking_ctx,
TABLE_LIST *table_list, bool *need_prelocking)
bool Lock_tables_prelocking_strategy::handle_table(THD *thd,
Query_tables_list *prelocking_ctx, TABLE_LIST *table_list,
bool *need_prelocking)
{
TABLE_LIST **last= prelocking_ctx->query_tables_last;
@@ -4919,9 +4919,9 @@ handle_table(THD *thd, Query_tables_list *prelocking_ctx,
a simple view, but one that uses stored routines.
*/
bool Alter_table_prelocking_strategy::
handle_routine(THD *thd, Query_tables_list *prelocking_ctx,
Sroutine_hash_entry *rt, sp_head *sp, bool *need_prelocking)
bool Alter_table_prelocking_strategy::handle_routine(THD *thd,
Query_tables_list *prelocking_ctx, Sroutine_hash_entry *rt,
sp_head *sp, bool *need_prelocking)
{
return FALSE;
}
@@ -4945,9 +4945,9 @@ handle_routine(THD *thd, Query_tables_list *prelocking_ctx,
@retval TRUE Failure (OOM).
*/
bool Alter_table_prelocking_strategy::
handle_table(THD *thd, Query_tables_list *prelocking_ctx,
TABLE_LIST *table_list, bool *need_prelocking)
bool Alter_table_prelocking_strategy::handle_table(THD *thd,
Query_tables_list *prelocking_ctx, TABLE_LIST *table_list,
bool *need_prelocking)
{
return FALSE;
}
@@ -4960,9 +4960,9 @@ handle_table(THD *thd, Query_tables_list *prelocking_ctx,
to be materialized.
*/
bool Alter_table_prelocking_strategy::
handle_view(THD *thd, Query_tables_list *prelocking_ctx,
TABLE_LIST *table_list, bool *need_prelocking)
bool Alter_table_prelocking_strategy::handle_view(THD *thd,
Query_tables_list *prelocking_ctx, TABLE_LIST *table_list,
bool *need_prelocking)
{
return FALSE;
}