Bug#30487 mysql_upgrade reports misleading errors

 - Update result file to include these "misleading errors", better to 
run mysql_upgrade with them than not at all.


mysql-test/r/mysql_upgrade.result:
  Update result file for mysql_upgrade after removing it's disabling

mysql-test/r/mysql_upgrade.result

@@ -3,7 +3,9 @@ mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.event                                        OK
 mysql.func                                         OK
-mysql.general_log                                  OK
+mysql.general_log
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.help_category                                OK
 mysql.help_keyword                                 OK
 mysql.help_relation                                OK
@@ -14,7 +16,9 @@ mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
 mysql.servers                                      OK
-mysql.slow_log                                     OK
+mysql.slow_log
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.tables_priv                                  OK
 mysql.time_zone                                    OK
 mysql.time_zone_leap_second                        OK
@@ -29,7 +33,9 @@ mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.event                                        OK
 mysql.func                                         OK
-mysql.general_log                                  OK
+mysql.general_log
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.help_category                                OK
 mysql.help_keyword                                 OK
 mysql.help_relation                                OK
@@ -40,7 +46,9 @@ mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
 mysql.servers                                      OK
-mysql.slow_log                                     OK
+mysql.slow_log
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.tables_priv                                  OK
 mysql.time_zone                                    OK
 mysql.time_zone_leap_second                        OK
@@ -55,7 +63,9 @@ mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.event                                        OK
 mysql.func                                         OK
-mysql.general_log                                  OK
+mysql.general_log
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.help_category                                OK
 mysql.help_keyword                                 OK
 mysql.help_relation                                OK
@@ -66,7 +76,9 @@ mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
 mysql.servers                                      OK
-mysql.slow_log                                     OK
+mysql.slow_log
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.tables_priv                                  OK
 mysql.time_zone                                    OK
 mysql.time_zone_leap_second                        OK
@@ -83,7 +95,9 @@ mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.event                                        OK
 mysql.func                                         OK
-mysql.general_log                                  OK
+mysql.general_log
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.help_category                                OK
 mysql.help_keyword                                 OK
 mysql.help_relation                                OK
@@ -94,7 +108,9 @@ mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
 mysql.servers                                      OK
-mysql.slow_log                                     OK
+mysql.slow_log
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.tables_priv                                  OK
 mysql.time_zone                                    OK
 mysql.time_zone_leap_second                        OK