Revert "Fixed Bug#20683741"

Erlend Dahl · Erlend Dahl · commit 571b9ad7b05c · 2015-04-24T12:41:00.000+02:00
This reverts commit 57d87b5f177edc18c06c18d53ea957290a76f169.
diff --git a/mysql-test/include/have_util_uz.inc b/mysql-test/include/have_util_uz.inc
@@ -17,6 +17,12 @@ disable_query_log;
 --let $uz=
 --let $_outfile= $MYSQLTEST_VARDIR/tmp/have_uz.tmp
 
+--echo # Skip this test other platfoms and run only on Linux.
+if (`select convert(@@version_compile_os using latin1) IN ("Linux") = 0`)
+{
+  skip Need Linux;
+}
+
 # find uz
 
 --error 0,1,127
diff --git a/mysql-test/suite/innodb/r/innodb-wl5980-linux.result b/mysql-test/suite/innodb/r/innodb-wl5980-linux.result
@@ -1,3 +1,4 @@
+# Skip this test other platfoms and run only on Linux.
 # Set the environmental variables
 # Stop server
 # Copy the remote tablespace & DB zip files from suite location to working location.
diff --git a/mysql-test/suite/innodb/t/innodb-wl5980-linux.test b/mysql-test/suite/innodb/t/innodb-wl5980-linux.test
@@ -9,10 +9,15 @@
 # Prerequisite : portability_wl5980_linux.zip
 # should exist in "suite/innodb/t"
 
---source include/linux.inc
 --source include/have_innodb_16k.inc
 --source include/not_embedded.inc
---source include/have_util_unzip.inc
+--source include/have_util_uz.inc
+
+--echo # Skip this test other platfoms and run only on Linux.
+if (`select convert(@@version_compile_os using latin1) IN ("Linux") = 0`)
+{
+  skip Need Linux;
+}
 
 --echo # Set the environmental variables
 let MYSQL_BASEDIR= `select @@basedir`;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# Skip this test other platfoms and run only on Linux.`
`1`	`2`	`# Set the environmental variables`
`2`	`3`	`# Stop server`
`3`	`4`	`# Copy the remote tablespace & DB zip files from suite location to working location.`