summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@skysql.com>2014-11-27 20:11:14 +0200
committerJan Lindström <jan.lindstrom@skysql.com>2014-11-27 20:11:14 +0200
commit7b55b67de5fdfe91283357fe6c7ccc3f9e355925 (patch)
tree8a7bd8c2fc750edca2f14e8e50b83d52b381c323
parent55e99b29339dae833448ded6d0ca3d31f673d02a (diff)
downloadmariadb-git-7b55b67de5fdfe91283357fe6c7ccc3f9e355925.tar.gz
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.
-rw-r--r--mysql-test/suite/innodb/t/innodb-page_compression_bzip2.test1
-rw-r--r--mysql-test/suite/innodb/t/innodb-page_compression_lz4.test1
-rw-r--r--mysql-test/suite/innodb/t/innodb-page_compression_lzma.test1
-rw-r--r--mysql-test/suite/innodb/t/innodb-page_compression_lzo.test2
-rw-r--r--mysql-test/suite/innodb/t/innodb-page_compression_tables.test3
-rw-r--r--mysql-test/suite/innodb/t/innodb-page_compression_zip.test3
-rw-r--r--mysql-test/suite/innodb/t/innodb_stats_create_on_corrupted.test1
7 files changed, 10 insertions, 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
index 2e8831151c7..51493266a60 100644
--- 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
index 731cbdeab66..f36ea9684e9 100644
--- 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
index 071e86b0f9b..6ea686bca04 100644
--- 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
index 6a73f793f26..96ba18f5112 100644
--- 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
index f7810a44c48..41d844d26b4 100644
--- 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
index 8d06367e9b2..67fafdb9e83 100644
--- 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
index de6026a23aa..c932e45591d 100644
--- 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");