Bug#53613: mysql_upgrade incorrectly revokes ...

Post-merge fix: adjust line numbers in pfs_upgrade test case
result given that mysql_system_tables_fix.sql was modified.

mysql-test/suite/perfschema/r/pfs_upgrade.result

@@ -26,7 +26,7 @@ ERROR 1050 (42S01) at line 445: Table 'SETUP_CONSUMERS' already exists
 ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists
 ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists
 ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists
-ERROR 1644 (HY000) at line 1140: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1138: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -57,7 +57,7 @@ ERROR 1050 (42S01) at line 445: Table 'SETUP_CONSUMERS' already exists
 ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists
 ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists
 ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists
-ERROR 1644 (HY000) at line 1140: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1138: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -86,7 +86,7 @@ ERROR 1050 (42S01) at line 445: Table 'SETUP_CONSUMERS' already exists
 ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists
 ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists
 ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists
-ERROR 1644 (HY000) at line 1140: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1138: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -115,7 +115,7 @@ ERROR 1050 (42S01) at line 445: Table 'SETUP_CONSUMERS' already exists
 ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists
 ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists
 ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists
-ERROR 1644 (HY000) at line 1140: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1138: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -144,7 +144,7 @@ ERROR 1050 (42S01) at line 445: Table 'SETUP_CONSUMERS' already exists
 ERROR 1050 (42S01) at line 462: Table 'SETUP_INSTRUMENTS' already exists
 ERROR 1050 (42S01) at line 482: Table 'SETUP_OBJECTS' already exists
 ERROR 1050 (42S01) at line 498: Table 'SETUP_TIMERS' already exists
-ERROR 1644 (HY000) at line 1140: Unexpected content found in the performance_schema database.
+ERROR 1644 (HY000) at line 1138: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name