1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

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.
This commit is contained in:
Jan Lindström
2014-11-27 20:11:14 +02:00
parent 55e99b2933
commit 7b55b67de5
7 changed files with 10 additions and 2 deletions

View File

@ -1,5 +1,6 @@
-- source include/have_innodb.inc -- source include/have_innodb.inc
-- source include/have_innodb_bzip2.inc -- source include/have_innodb_bzip2.inc
-- source include/not_embedded.inc
--disable_query_log --disable_query_log
let $innodb_compression_algorithm_orig=`select @@innodb_compression_algorithm`; let $innodb_compression_algorithm_orig=`select @@innodb_compression_algorithm`;

View File

@ -1,5 +1,6 @@
-- source include/have_innodb.inc -- source include/have_innodb.inc
-- source include/have_innodb_lz4.inc -- source include/have_innodb_lz4.inc
-- source include/not_embedded.inc
--disable_query_log --disable_query_log
let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`; let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;

View File

@ -1,5 +1,6 @@
-- source include/have_innodb.inc -- source include/have_innodb.inc
-- source include/have_innodb_lzma.inc -- source include/have_innodb_lzma.inc
-- source include/not_embedded.inc
--disable_query_log --disable_query_log
let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`; let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;

View File

@ -1,5 +1,7 @@
-- source include/have_innodb.inc -- source include/have_innodb.inc
-- source include/have_innodb_lzo.inc -- source include/have_innodb_lzo.inc
-- source include/not_embedded.inc
--disable_query_log --disable_query_log
let $innodb_compression_algorithm_orig=`select @@innodb_compression_algorithm`; let $innodb_compression_algorithm_orig=`select @@innodb_compression_algorithm`;

View File

@ -1,4 +1,5 @@
-- source include/have_innodb.inc --source include/have_innodb.inc
--source include/not_embedded.inc
--disable_query_log --disable_query_log
let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`; let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;

View File

@ -1,4 +1,5 @@
-- source include/have_innodb.inc --source include/have_innodb.inc
--source include/not_embedded.inc
--disable_query_log --disable_query_log
let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`; let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`;

View File

@ -8,6 +8,7 @@
# functionality tested here is not related to the page size, so we only # functionality tested here is not related to the page size, so we only
# test with 16k page size. # test with 16k page size.
-- source include/have_innodb_16k.inc -- 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: Table \"mysql\".\"innodb_index_stats\" not found");
call mtr.add_suppression("InnoDB: Error: Fetch of persistent statistics requested for table"); call mtr.add_suppression("InnoDB: Error: Fetch of persistent statistics requested for table");