Skip to content

Commit f9de1ab

Browse files
committed
Bug#36369221: Fix message related to SUPER and CHANGE MASTER
Merge branch 'mysql-8.4' into mysql-trunk
2 parents e250faa + a05bad0 commit f9de1ab

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

mysql-test/r/grant.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ Select Tables To retrieve rows from table
500500
Show databases Server Admin To see all databases with SHOW DATABASES
501501
Show view Tables To see views with SHOW CREATE VIEW
502502
Shutdown Server Admin To shut down the server
503-
Super Server Admin To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
503+
Super Server Admin To use KILL thread, SET GLOBAL, CHANGE REPLICATION SOURCE, etc.
504504
TABLE_ENCRYPTION_ADMIN Server Admin
505505
TELEMETRY_LOG_ADMIN Server Admin
506506
TRANSACTION_GTID_TAG Server Admin

mysql-test/r/grant_dynamic.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ Select Tables To retrieve rows from table
10261026
Show databases Server Admin To see all databases with SHOW DATABASES
10271027
Show view Tables To see views with SHOW CREATE VIEW
10281028
Shutdown Server Admin To shut down the server
1029-
Super Server Admin To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
1029+
Super Server Admin To use KILL thread, SET GLOBAL, CHANGE REPLICATION SOURCE, etc.
10301030
TABLE_ENCRYPTION_ADMIN Server Admin
10311031
TELEMETRY_LOG_ADMIN Server Admin
10321032
TRANSACTION_GTID_TAG Server Admin

mysql-test/r/roles.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ Select Tables To retrieve rows from table
844844
Show databases Server Admin To see all databases with SHOW DATABASES
845845
Show view Tables To see views with SHOW CREATE VIEW
846846
Shutdown Server Admin To shut down the server
847-
Super Server Admin To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
847+
Super Server Admin To use KILL thread, SET GLOBAL, CHANGE REPLICATION SOURCE, etc.
848848
TABLE_ENCRYPTION_ADMIN Server Admin
849849
TELEMETRY_LOG_ADMIN Server Admin
850850
TRANSACTION_GTID_TAG Server Admin

mysql-test/r/version_token.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ Select Tables To retrieve rows from table
319319
Show databases Server Admin To see all databases with SHOW DATABASES
320320
Show view Tables To see views with SHOW CREATE VIEW
321321
Shutdown Server Admin To shut down the server
322-
Super Server Admin To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
322+
Super Server Admin To use KILL thread, SET GLOBAL, CHANGE REPLICATION SOURCE, etc.
323323
TABLE_ENCRYPTION_ADMIN Server Admin
324324
TELEMETRY_LOG_ADMIN Server Admin
325325
TRANSACTION_GTID_TAG Server Admin

sql/sql_show.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ static struct show_privileges_st sys_privileges[] = {
946946
{"Show view", "Tables", "To see views with SHOW CREATE VIEW"},
947947
{"Shutdown", "Server Admin", "To shut down the server"},
948948
{"Super", "Server Admin",
949-
"To use KILL thread, SET GLOBAL, CHANGE MASTER, etc."},
949+
"To use KILL thread, SET GLOBAL, CHANGE REPLICATION SOURCE, etc."},
950950
{"Trigger", "Tables", "To use triggers"},
951951
{"Create tablespace", "Server Admin", "To create/alter/drop tablespaces"},
952952
{"Update", "Tables", "To update existing rows"},

0 commit comments

Comments
 (0)