Skip to content

M
MariaDB
Commit 4be15fe0 authored by Monty's avatar Monty Committed by Sergei Golubchik
Browse files
Options

Added missing ; after WSREP_TO_ISOLATION_BEGIN 

- Changed also a few ;; to ;
parent 21518ab2
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
sql/sql_parse.cc
View file @ 4be15fe0
...@@ -600,7 +600,7 @@ void init_update_queries(void) ...@@ -600,7 +600,7 @@ void init_update_queries(void)
sql_command_flags[SQLCOM_DELETE_MULTI]= CF_CHANGES_DATA | CF_REEXECUTION_FRAGILE | sql_command_flags[SQLCOM_DELETE_MULTI]= CF_CHANGES_DATA | CF_REEXECUTION_FRAGILE |
CF_CAN_GENERATE_ROW_EVENTS | CF_CAN_GENERATE_ROW_EVENTS |
CF_OPTIMIZER_TRACE | CF_OPTIMIZER_TRACE |
CF_CAN_BE_EXPLAINED;; CF_CAN_BE_EXPLAINED;
sql_command_flags[SQLCOM_REPLACE]= CF_CHANGES_DATA | CF_REEXECUTION_FRAGILE | sql_command_flags[SQLCOM_REPLACE]= CF_CHANGES_DATA | CF_REEXECUTION_FRAGILE |
CF_CAN_GENERATE_ROW_EVENTS | CF_CAN_GENERATE_ROW_EVENTS |
CF_OPTIMIZER_TRACE | CF_OPTIMIZER_TRACE |
...@@ -4225,7 +4225,7 @@ mysql_execute_command(THD *thd) ...@@ -4225,7 +4225,7 @@ mysql_execute_command(THD *thd)
(!thd->is_current_stmt_binlog_format_row() || (!thd->is_current_stmt_binlog_format_row() ||
!create_info.tmp_table())) !create_info.tmp_table()))
{ {
WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name, NULL) WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name, NULL);
} }
/* Regular CREATE TABLE */ /* Regular CREATE TABLE */
res= mysql_create_table(thd, create_table, &create_info, &alter_info); res= mysql_create_table(thd, create_table, &create_info, &alter_info);
...@@ -4270,7 +4270,7 @@ mysql_execute_command(THD *thd) ...@@ -4270,7 +4270,7 @@ mysql_execute_command(THD *thd)
DBUG_ASSERT(first_table == all_tables && first_table != 0); DBUG_ASSERT(first_table == all_tables && first_table != 0);
if (check_one_table_access(thd, INDEX_ACL, all_tables)) if (check_one_table_access(thd, INDEX_ACL, all_tables))
goto error; /* purecov: inspected */ goto error; /* purecov: inspected */
WSREP_TO_ISOLATION_BEGIN(first_table->db, first_table->table_name, NULL) WSREP_TO_ISOLATION_BEGIN(first_table->db, first_table->table_name, NULL);
/* /*
Currently CREATE INDEX or DROP INDEX cause a full table rebuild Currently CREATE INDEX or DROP INDEX cause a full table rebuild
and thus classify as slow administrative statements just like and thus classify as slow administrative statements just like
...@@ -4395,7 +4395,7 @@ mysql_execute_command(THD *thd) ...@@ -4395,7 +4395,7 @@ mysql_execute_command(THD *thd)
if (check_rename_table(thd, first_table, all_tables)) if (check_rename_table(thd, first_table, all_tables))
goto error; goto error;
WSREP_TO_ISOLATION_BEGIN(0, 0, first_table) WSREP_TO_ISOLATION_BEGIN(0, 0, first_table);
if (mysql_rename_tables(thd, first_table, 0)) if (mysql_rename_tables(thd, first_table, 0))
goto error; goto error;
...@@ -5178,7 +5178,7 @@ mysql_execute_command(THD *thd) ...@@ -5178,7 +5178,7 @@ mysql_execute_command(THD *thd)
(CREATE_ACL | DROP_ACL) : CREATE_ACL, (CREATE_ACL | DROP_ACL) : CREATE_ACL,
&lex->name)) &lex->name))
break; break;
WSREP_TO_ISOLATION_BEGIN(lex->name.str, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(lex->name.str, NULL, NULL);
res= mysql_create_db(thd, lex->name.str, res= mysql_create_db(thd, lex->name.str,
lex->create_info, &lex->create_info); lex->create_info, &lex->create_info);
break; break;
...@@ -5187,7 +5187,7 @@ mysql_execute_command(THD *thd) ...@@ -5187,7 +5187,7 @@ mysql_execute_command(THD *thd)
{ {
if (prepare_db_action(thd, DROP_ACL, &lex->name)) if (prepare_db_action(thd, DROP_ACL, &lex->name))
break; break;
WSREP_TO_ISOLATION_BEGIN(lex->name.str, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(lex->name.str, NULL, NULL);
res= mysql_rm_db(thd, lex->name.str, lex->if_exists()); res= mysql_rm_db(thd, lex->name.str, lex->if_exists());
break; break;
} }
...@@ -5219,7 +5219,7 @@ mysql_execute_command(THD *thd) ...@@ -5219,7 +5219,7 @@ mysql_execute_command(THD *thd)
res= 1; res= 1;
break; break;
} }
WSREP_TO_ISOLATION_BEGIN(db->str, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(db->str, NULL, NULL);
res= mysql_upgrade_db(thd, db); res= mysql_upgrade_db(thd, db);
if (!res) if (!res)
my_ok(thd); my_ok(thd);
...@@ -5230,7 +5230,7 @@ mysql_execute_command(THD *thd) ...@@ -5230,7 +5230,7 @@ mysql_execute_command(THD *thd)
LEX_CSTRING *db= &lex->name; LEX_CSTRING *db= &lex->name;
if (prepare_db_action(thd, ALTER_ACL, db)) if (prepare_db_action(thd, ALTER_ACL, db))
break; break;
WSREP_TO_ISOLATION_BEGIN(db->str, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(db->str, NULL, NULL);
res= mysql_alter_db(thd, db->str, &lex->create_info); res= mysql_alter_db(thd, db->str, &lex->create_info);
break; break;
} }
...@@ -5273,7 +5273,7 @@ mysql_execute_command(THD *thd) ...@@ -5273,7 +5273,7 @@ mysql_execute_command(THD *thd)
if (res) if (res)
break; break;
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
switch (lex->sql_command) { switch (lex->sql_command) {
case SQLCOM_CREATE_EVENT: case SQLCOM_CREATE_EVENT:
{ {
...@@ -5309,7 +5309,7 @@ mysql_execute_command(THD *thd) ...@@ -5309,7 +5309,7 @@ mysql_execute_command(THD *thd)
&lex->spname->m_name); &lex->spname->m_name);
break; break;
case SQLCOM_DROP_EVENT: case SQLCOM_DROP_EVENT:
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
if (!(res= Events::drop_event(thd, if (!(res= Events::drop_event(thd,
&lex->spname->m_db, &lex->spname->m_name, &lex->spname->m_db, &lex->spname->m_name,
lex->if_exists()))) lex->if_exists())))
...@@ -5326,7 +5326,7 @@ mysql_execute_command(THD *thd) ...@@ -5326,7 +5326,7 @@ mysql_execute_command(THD *thd)
"mysql", NULL, NULL, 1, 0)) "mysql", NULL, NULL, 1, 0))
break; break;
#ifdef HAVE_DLOPEN #ifdef HAVE_DLOPEN
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
if (!(res = mysql_create_function(thd, &lex->udf))) if (!(res = mysql_create_function(thd, &lex->udf)))
my_ok(thd); my_ok(thd);
#else #else
...@@ -5344,7 +5344,7 @@ mysql_execute_command(THD *thd) ...@@ -5344,7 +5344,7 @@ mysql_execute_command(THD *thd)
"mysql", NULL, NULL, 1, 1) && "mysql", NULL, NULL, 1, 1) &&
check_global_access(thd,CREATE_USER_ACL)) check_global_access(thd,CREATE_USER_ACL))
break; break;
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
/* Conditionally writes to binlog */ /* Conditionally writes to binlog */
if (!(res= mysql_create_user(thd, lex->users_list, if (!(res= mysql_create_user(thd, lex->users_list,
lex->sql_command == SQLCOM_CREATE_ROLE))) lex->sql_command == SQLCOM_CREATE_ROLE)))
...@@ -5358,7 +5358,7 @@ mysql_execute_command(THD *thd) ...@@ -5358,7 +5358,7 @@ mysql_execute_command(THD *thd)
check_global_access(thd,CREATE_USER_ACL)) check_global_access(thd,CREATE_USER_ACL))
break; break;
/* Conditionally writes to binlog */ /* Conditionally writes to binlog */
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
if (!(res= mysql_drop_user(thd, lex->users_list, if (!(res= mysql_drop_user(thd, lex->users_list,
lex->sql_command == SQLCOM_DROP_ROLE))) lex->sql_command == SQLCOM_DROP_ROLE)))
my_ok(thd); my_ok(thd);
...@@ -5371,7 +5371,7 @@ mysql_execute_command(THD *thd) ...@@ -5371,7 +5371,7 @@ mysql_execute_command(THD *thd)
check_global_access(thd,CREATE_USER_ACL)) check_global_access(thd,CREATE_USER_ACL))
break; break;
/* Conditionally writes to binlog */ /* Conditionally writes to binlog */
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
if (lex->sql_command == SQLCOM_ALTER_USER) if (lex->sql_command == SQLCOM_ALTER_USER)
res= mysql_alter_user(thd, lex->users_list); res= mysql_alter_user(thd, lex->users_list);
else else
...@@ -5387,7 +5387,7 @@ mysql_execute_command(THD *thd) ...@@ -5387,7 +5387,7 @@ mysql_execute_command(THD *thd)
break; break;
/* Conditionally writes to binlog */ /* Conditionally writes to binlog */
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
if (!(res = mysql_revoke_all(thd, lex->users_list))) if (!(res = mysql_revoke_all(thd, lex->users_list)))
my_ok(thd); my_ok(thd);
break; break;
...@@ -5448,7 +5448,7 @@ mysql_execute_command(THD *thd) ...@@ -5448,7 +5448,7 @@ mysql_execute_command(THD *thd)
if (check_grant_routine(thd, grants | GRANT_ACL, all_tables, sph, 0)) if (check_grant_routine(thd, grants | GRANT_ACL, all_tables, sph, 0))
goto error; goto error;
/* Conditionally writes to binlog */ /* Conditionally writes to binlog */
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
res= mysql_routine_grant(thd, all_tables, sph, res= mysql_routine_grant(thd, all_tables, sph,
lex->users_list, grants, lex->users_list, grants,
lex->sql_command == SQLCOM_REVOKE, TRUE); lex->sql_command == SQLCOM_REVOKE, TRUE);
...@@ -5461,7 +5461,7 @@ mysql_execute_command(THD *thd) ...@@ -5461,7 +5461,7 @@ mysql_execute_command(THD *thd)
all_tables, FALSE, UINT_MAX, FALSE)) all_tables, FALSE, UINT_MAX, FALSE))
goto error; goto error;
/* Conditionally writes to binlog */ /* Conditionally writes to binlog */
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
res= mysql_table_grant(thd, all_tables, lex->users_list, res= mysql_table_grant(thd, all_tables, lex->users_list,
lex->columns, lex->grant, lex->columns, lex->grant,
lex->sql_command == SQLCOM_REVOKE); lex->sql_command == SQLCOM_REVOKE);
...@@ -5477,7 +5477,7 @@ mysql_execute_command(THD *thd) ...@@ -5477,7 +5477,7 @@ mysql_execute_command(THD *thd)
} }
else else
{ {
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
/* Conditionally writes to binlog */ /* Conditionally writes to binlog */
res= mysql_grant(thd, select_lex->db, lex->users_list, lex->grant, res= mysql_grant(thd, select_lex->db, lex->users_list, lex->grant,
lex->sql_command == SQLCOM_REVOKE, lex->sql_command == SQLCOM_REVOKE,
...@@ -5503,7 +5503,7 @@ mysql_execute_command(THD *thd) ...@@ -5503,7 +5503,7 @@ mysql_execute_command(THD *thd)
case SQLCOM_REVOKE_ROLE: case SQLCOM_REVOKE_ROLE:
case SQLCOM_GRANT_ROLE: case SQLCOM_GRANT_ROLE:
{ {
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
if (!(res= mysql_grant_role(thd, lex->users_list, if (!(res= mysql_grant_role(thd, lex->users_list,
lex->sql_command != SQLCOM_GRANT_ROLE))) lex->sql_command != SQLCOM_GRANT_ROLE)))
my_ok(thd); my_ok(thd);
...@@ -5561,7 +5561,7 @@ mysql_execute_command(THD *thd) ...@@ -5561,7 +5561,7 @@ mysql_execute_command(THD *thd)
REFRESH_STATUS | REFRESH_STATUS |
REFRESH_USER_RESOURCES)) REFRESH_USER_RESOURCES))
{ {
WSREP_TO_ISOLATION_BEGIN_WRTCHK(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN_WRTCHK(WSREP_MYSQL_DB, NULL, NULL);
} }
#endif /* WITH_WSREP*/ #endif /* WITH_WSREP*/
...@@ -5935,7 +5935,7 @@ mysql_execute_command(THD *thd) ...@@ -5935,7 +5935,7 @@ mysql_execute_command(THD *thd)
if (check_routine_access(thd, ALTER_PROC_ACL, db, name, if (check_routine_access(thd, ALTER_PROC_ACL, db, name,
Sp_handler::handler(lex->sql_command), 0)) Sp_handler::handler(lex->sql_command), 0))
goto error; goto error;
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
/* Conditionally writes to binlog */ /* Conditionally writes to binlog */
sp_result= sph->sp_drop_routine(thd, lex->spname); sp_result= sph->sp_drop_routine(thd, lex->spname);
...@@ -6054,7 +6054,7 @@ mysql_execute_command(THD *thd) ...@@ -6054,7 +6054,7 @@ mysql_execute_command(THD *thd)
Note: SQLCOM_CREATE_VIEW also handles 'ALTER VIEW' commands Note: SQLCOM_CREATE_VIEW also handles 'ALTER VIEW' commands
as specified through the thd->lex->create_view->mode flag. as specified through the thd->lex->create_view->mode flag.
*/ */
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
res= mysql_create_view(thd, first_table, thd->lex->create_view->mode); res= mysql_create_view(thd, first_table, thd->lex->create_view->mode);
break; break;
} }
...@@ -6063,14 +6063,14 @@ mysql_execute_command(THD *thd) ...@@ -6063,14 +6063,14 @@ mysql_execute_command(THD *thd)
if (check_table_access(thd, DROP_ACL, all_tables, FALSE, UINT_MAX, FALSE)) if (check_table_access(thd, DROP_ACL, all_tables, FALSE, UINT_MAX, FALSE))
goto error; goto error;
/* Conditionally writes to binlog. */ /* Conditionally writes to binlog. */
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
res= mysql_drop_view(thd, first_table, thd->lex->drop_mode); res= mysql_drop_view(thd, first_table, thd->lex->drop_mode);
break; break;
} }
case SQLCOM_CREATE_TRIGGER: case SQLCOM_CREATE_TRIGGER:
{ {
/* Conditionally writes to binlog. */ /* Conditionally writes to binlog. */
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
res= mysql_create_or_drop_trigger(thd, all_tables, 1); res= mysql_create_or_drop_trigger(thd, all_tables, 1);
break; break;
...@@ -6078,7 +6078,7 @@ mysql_execute_command(THD *thd) ...@@ -6078,7 +6078,7 @@ mysql_execute_command(THD *thd)
case SQLCOM_DROP_TRIGGER: case SQLCOM_DROP_TRIGGER:
{ {
/* Conditionally writes to binlog. */ /* Conditionally writes to binlog. */
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
res= mysql_create_or_drop_trigger(thd, all_tables, 0); res= mysql_create_or_drop_trigger(thd, all_tables, 0);
break; break;
} }
...@@ -6143,13 +6143,13 @@ mysql_execute_command(THD *thd) ...@@ -6143,13 +6143,13 @@ mysql_execute_command(THD *thd)
my_ok(thd); my_ok(thd);
break; break;
case SQLCOM_INSTALL_PLUGIN: case SQLCOM_INSTALL_PLUGIN:
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
if (! (res= mysql_install_plugin(thd, &thd->lex->comment, if (! (res= mysql_install_plugin(thd, &thd->lex->comment,
&thd->lex->ident))) &thd->lex->ident)))
my_ok(thd); my_ok(thd);
break; break;
case SQLCOM_UNINSTALL_PLUGIN: case SQLCOM_UNINSTALL_PLUGIN:
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
if (! (res= mysql_uninstall_plugin(thd, &thd->lex->comment, if (! (res= mysql_uninstall_plugin(thd, &thd->lex->comment,
&thd->lex->ident))) &thd->lex->ident)))
my_ok(thd); my_ok(thd);
...@@ -6170,7 +6170,7 @@ mysql_execute_command(THD *thd) ...@@ -6170,7 +6170,7 @@ mysql_execute_command(THD *thd)
if (check_global_access(thd, SUPER_ACL)) if (check_global_access(thd, SUPER_ACL))
break; break;
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
res= create_server(thd, &lex->server_options); res= create_server(thd, &lex->server_options);
break; break;
...@@ -6183,7 +6183,7 @@ mysql_execute_command(THD *thd) ...@@ -6183,7 +6183,7 @@ mysql_execute_command(THD *thd)
if (check_global_access(thd, SUPER_ACL)) if (check_global_access(thd, SUPER_ACL))
break; break;
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
if ((error= alter_server(thd, &lex->server_options))) if ((error= alter_server(thd, &lex->server_options)))
{ {
...@@ -6203,7 +6203,7 @@ mysql_execute_command(THD *thd) ...@@ -6203,7 +6203,7 @@ mysql_execute_command(THD *thd)
if (check_global_access(thd, SUPER_ACL)) if (check_global_access(thd, SUPER_ACL))
break; break;
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL);
if ((err_code= drop_server(thd, &lex->server_options))) if ((err_code= drop_server(thd, &lex->server_options)))
{ {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7