Bug#35327006 Stabilize the weekly runs [noclose]

The test innodb.portability_tablespace_windows is unstable (select
results don't always come back in the same order).

Fix it by using --sorted_results. For completeness, do the same change
in innodb.portability_linux.

Change-Id: I0cb0e77aa8e4cd1ac01e78dacf030dd16eb22d93

Author: dahlerlend

mysql-test/suite/innodb/r/portability_tablespace_linux.result

@@ -52,9 +52,6 @@ SELECT TABLESPACE_NAME,FILE_TYPE,TABLE_NAME,ENGINE FROM INFORMATION_SCHEMA.FILES
 TABLESPACE_NAME	FILE_TYPE	TABLE_NAME	ENGINE
 #	TABLESPACE	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
-#	TEMPORARY	NULL	InnoDB
-#	UNDO LOG	NULL	InnoDB
-#	UNDO LOG	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
@@ -66,6 +63,9 @@ TABLESPACE_NAME	FILE_TYPE	TABLE_NAME	ENGINE
 #	TABLESPACE	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
+#	TEMPORARY	NULL	InnoDB
+#	UNDO LOG	NULL	InnoDB
+#	UNDO LOG	NULL	InnoDB
 #	UNDO LOG	NULL	InnoDB
 #	UNDO LOG	NULL	InnoDB
 #	UNDO LOG	NULL	InnoDB

mysql-test/suite/innodb/r/portability_tablespace_windows.result

@@ -53,12 +53,6 @@ TABLESPACE_NAME	FILE_TYPE	TABLE_NAME	ENGINE
 #	TABLESPACE	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
-#	TEMPORARY	NULL	InnoDB
-#	UNDO LOG	NULL	InnoDB
-#	UNDO LOG	NULL	InnoDB
-#	UNDO LOG	NULL	InnoDB
-#	UNDO LOG	NULL	InnoDB
-#	UNDO LOG	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
@@ -69,6 +63,12 @@ TABLESPACE_NAME	FILE_TYPE	TABLE_NAME	ENGINE
 #	TABLESPACE	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
 #	TABLESPACE	NULL	InnoDB
+#	TEMPORARY	NULL	InnoDB
+#	UNDO LOG	NULL	InnoDB
+#	UNDO LOG	NULL	InnoDB
+#	UNDO LOG	NULL	InnoDB
+#	UNDO LOG	NULL	InnoDB
+#	UNDO LOG	NULL	InnoDB
 ## Stop DB server
 ## restart the server with --datadir and innodb-directories
 ## Check new datadir

mysql-test/suite/innodb/t/portability_tablespace_linux.test

@@ -67,6 +67,7 @@ SHOW CREATE TABLE purchase;
 
 # server was crashing here with ha_innodb.cc != nullptr
 --replace_column 1 #
+--sorted_result
 SELECT TABLESPACE_NAME,FILE_TYPE,TABLE_NAME,ENGINE FROM INFORMATION_SCHEMA.FILES ORDER BY TABLESPACE_NAME,FILE_TYPE,TABLE_NAME,ENGINE;
 
 --echo ## Stop DB server

mysql-test/suite/innodb/t/portability_tablespace_windows.test

@@ -58,6 +58,7 @@ SHOW CREATE TABLE purchase;
 
 # server was crashing here with ha_innodb.cc != nullptr
 --replace_column 1 #
+--sorted_result
 SELECT TABLESPACE_NAME,FILE_TYPE,TABLE_NAME,ENGINE FROM INFORMATION_SCHEMA.FILES;
 
 --echo ## Stop DB server