Skip to content

Commit 660f0cf

Browse files
committed
correct sql_command_flags: add CF_CHANGES_DATA as needed
SQLCOM_REVOKE_ALL needs it because SQLCOM_REVOKE does. SQLCOM_DROP_ROLE needs it because SQLCOM_DROP_USER does. SQLCOM_CREATE_SERVER / SQLCOM_ALTER_SERVER / SQLCOM_DROP_SERVER need it because SQLCOM_CREATE_USER / etc do.
1 parent a185ff2 commit 660f0cf

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

sql/sql_parse.cc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -689,14 +689,19 @@ void init_update_queries(void)
689689
sql_command_flags[SQLCOM_SHOW_TABLE_STATUS]= (CF_STATUS_COMMAND | CF_SHOW_TABLE_COMMAND | CF_REEXECUTION_FRAGILE);
690690

691691

692+
sql_command_flags[SQLCOM_CREATE_SERVER]= CF_CHANGES_DATA;
693+
sql_command_flags[SQLCOM_ALTER_SERVER]= CF_CHANGES_DATA;
694+
sql_command_flags[SQLCOM_DROP_SERVER]= CF_CHANGES_DATA;
692695
sql_command_flags[SQLCOM_CREATE_USER]= CF_CHANGES_DATA;
693696
sql_command_flags[SQLCOM_RENAME_USER]= CF_CHANGES_DATA;
694697
sql_command_flags[SQLCOM_DROP_USER]= CF_CHANGES_DATA;
695698
sql_command_flags[SQLCOM_ALTER_USER]= CF_CHANGES_DATA;
696699
sql_command_flags[SQLCOM_CREATE_ROLE]= CF_CHANGES_DATA;
700+
sql_command_flags[SQLCOM_DROP_ROLE]= CF_CHANGES_DATA;
697701
sql_command_flags[SQLCOM_GRANT]= CF_CHANGES_DATA;
698702
sql_command_flags[SQLCOM_GRANT_ROLE]= CF_CHANGES_DATA;
699703
sql_command_flags[SQLCOM_REVOKE]= CF_CHANGES_DATA;
704+
sql_command_flags[SQLCOM_REVOKE_ALL]= CF_CHANGES_DATA;
700705
sql_command_flags[SQLCOM_REVOKE_ROLE]= CF_CHANGES_DATA;
701706
sql_command_flags[SQLCOM_OPTIMIZE]= CF_CHANGES_DATA;
702707
sql_command_flags[SQLCOM_CREATE_FUNCTION]= CF_CHANGES_DATA | CF_AUTO_COMMIT_TRANS;
@@ -764,16 +769,16 @@ void init_update_queries(void)
764769
sql_command_flags[SQLCOM_CREATE_ROLE]|= CF_AUTO_COMMIT_TRANS;
765770
sql_command_flags[SQLCOM_DROP_ROLE]|= CF_AUTO_COMMIT_TRANS;
766771
sql_command_flags[SQLCOM_REVOKE]|= CF_AUTO_COMMIT_TRANS;
767-
sql_command_flags[SQLCOM_REVOKE_ALL]= CF_AUTO_COMMIT_TRANS;
772+
sql_command_flags[SQLCOM_REVOKE_ALL]|= CF_AUTO_COMMIT_TRANS;
768773
sql_command_flags[SQLCOM_REVOKE_ROLE]|= CF_AUTO_COMMIT_TRANS;
769774
sql_command_flags[SQLCOM_GRANT]|= CF_AUTO_COMMIT_TRANS;
770775
sql_command_flags[SQLCOM_GRANT_ROLE]|= CF_AUTO_COMMIT_TRANS;
771776

772777
sql_command_flags[SQLCOM_FLUSH]= CF_AUTO_COMMIT_TRANS;
773778
sql_command_flags[SQLCOM_RESET]= CF_AUTO_COMMIT_TRANS;
774-
sql_command_flags[SQLCOM_CREATE_SERVER]= CF_AUTO_COMMIT_TRANS;
775-
sql_command_flags[SQLCOM_ALTER_SERVER]= CF_AUTO_COMMIT_TRANS;
776-
sql_command_flags[SQLCOM_DROP_SERVER]= CF_AUTO_COMMIT_TRANS;
779+
sql_command_flags[SQLCOM_CREATE_SERVER]|= CF_AUTO_COMMIT_TRANS;
780+
sql_command_flags[SQLCOM_ALTER_SERVER]|= CF_AUTO_COMMIT_TRANS;
781+
sql_command_flags[SQLCOM_DROP_SERVER]|= CF_AUTO_COMMIT_TRANS;
777782
sql_command_flags[SQLCOM_BACKUP]= CF_AUTO_COMMIT_TRANS;
778783
sql_command_flags[SQLCOM_BACKUP_LOCK]= CF_AUTO_COMMIT_TRANS;
779784

0 commit comments

Comments
 (0)