Merge 10.2 into 10.3

main.derived_cond_pushdown: Move all 10.3 tests to the end,
trim trailing white space, and add an "End of 10.3 tests" marker.
Add --sorted_result to tests where the ordering is not deterministic.

main.win_percentile: Add --sorted_result to tests where the
ordering is no longer deterministic.

1 files changed, 4 insertions, 6 deletions

diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 8c231d9b8f7..b2ceb1627a1 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -2221,10 +2221,9 @@ err:
   if (argv)
     free_defaults(argv);
   DBUG_RETURN(error);
-#ifdef WITH_WSREP
-error:
+
+WSREP_ERROR_LABEL:
   DBUG_RETURN(TRUE);
-#endif /* WITH_WSREP */
 }
 
 
@@ -2367,10 +2366,9 @@ bool mysql_uninstall_plugin(THD *thd, const LEX_CSTRING *name,
 
   mysql_mutex_unlock(&LOCK_plugin);
   DBUG_RETURN(error);
-#ifdef WITH_WSREP
-error:
+
+WSREP_ERROR_LABEL:
   DBUG_RETURN(TRUE);
-#endif /* WITH_WSREP */
 }