MDEV-7228: innodb.innodb-page_compression_tables, innodb.innodb-page_…

…compression_zip, innodb.innodb_stats_create_on_corrupted fail with embedded server Problem is that tests restart the server and "shutdown_server" looks for pid file # which is not there with embedded mode. Fix tests so that they are not run with embedded mode.
MariaDB · Nov 27, 2014 · 7b55b67 · 7b55b67
1 parent 55e99b2
commit 7b55b67
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 2 deletions.
diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_bzip2.test b/mysql-test/suite/innodb/t/innodb-page_compression_bzip2.test
@@ -1,5 +1,6 @@
 -- source include/have_innodb.inc
 -- source include/have_innodb_bzip2.inc
+-- source include/not_embedded.inc
 
 --disable_query_log
 let $innodb_compression_algorithm_orig=`select @@innodb_compression_algorithm`;

diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_lz4.test b/mysql-test/suite/innodb/t/innodb-page_compression_lz4.test
@@ -1,5 +1,6 @@
 -- source include/have_innodb.inc
 -- source include/have_innodb_lz4.inc
+-- source include/not_embedded.inc
 
 --disable_query_log
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;

diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_lzma.test b/mysql-test/suite/innodb/t/innodb-page_compression_lzma.test
@@ -1,5 +1,6 @@
 -- source include/have_innodb.inc
 -- source include/have_innodb_lzma.inc
+-- source include/not_embedded.inc
 
 --disable_query_log
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;

diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_lzo.test b/mysql-test/suite/innodb/t/innodb-page_compression_lzo.test
@@ -1,5 +1,7 @@
 -- source include/have_innodb.inc
 -- source include/have_innodb_lzo.inc
+-- source include/not_embedded.inc
+
 
 --disable_query_log
 let $innodb_compression_algorithm_orig=`select @@innodb_compression_algorithm`;

diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_tables.test b/mysql-test/suite/innodb/t/innodb-page_compression_tables.test
@@ -1,4 +1,5 @@
--- source include/have_innodb.inc
+--source include/have_innodb.inc
+--source include/not_embedded.inc
 
 --disable_query_log
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;

diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_zip.test b/mysql-test/suite/innodb/t/innodb-page_compression_zip.test
@@ -1,4 +1,5 @@
--- source include/have_innodb.inc
+--source include/have_innodb.inc
+--source include/not_embedded.inc
 
 --disable_query_log
 let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;

diff --git a/mysql-test/suite/innodb/t/innodb_stats_create_on_corrupted.test b/mysql-test/suite/innodb/t/innodb_stats_create_on_corrupted.test
@@ -8,6 +8,7 @@
 # functionality tested here is not related to the page size, so we only
 # test with 16k page size.
 -- source include/have_innodb_16k.inc
+-- source include/not_embedded.inc
 
 call mtr.add_suppression("InnoDB: Error: Table \"mysql\".\"innodb_index_stats\" not found");
 call mtr.add_suppression("InnoDB: Error: Fetch of persistent statistics requested for table");