mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
skipped tests: improve skip messages, move to a proper suite, disable as needed
mysql-test/include/have_binlog_format_mixed_or_row.inc: better skip message mysql-test/include/have_binlog_format_mixed_or_statement.inc: better skip message mysql-test/include/have_binlog_format_row_or_statement.inc: better skip message mysql-test/t/warnings_engine_disabled.test: better skip message
This commit is contained in:
parent
2853f6bfbb
commit
73a46b3eb9
14 changed files with 41 additions and 36 deletions
|
@ -1,6 +1,6 @@
|
|||
--source include/have_log_bin.inc
|
||||
|
||||
-- require r/have_binlog_format_mixed.require
|
||||
disable_query_log;
|
||||
show variables like 'binlog_format';
|
||||
enable_query_log;
|
||||
if (`SELECT @@binlog_format != 'MIXED'`)
|
||||
{
|
||||
--skip Not MIXED format
|
||||
}
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
--source include/have_log_bin.inc
|
||||
|
||||
--require r/have_binlog_format_row.require
|
||||
--disable_query_log
|
||||
--replace_result MIXED ROW
|
||||
show variables like 'binlog_format';
|
||||
--enable_query_log
|
||||
if (`SELECT @@binlog_format = 'STATEMENT'`)
|
||||
{
|
||||
--skip Neither MIXED nor ROW binlog format
|
||||
}
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
source include/have_log_bin.inc;
|
||||
|
||||
|
||||
--require r/have_binlog_format_statement.require
|
||||
--disable_query_log
|
||||
--replace_result MIXED STATEMENT
|
||||
show variables like 'binlog_format';
|
||||
--enable_query_log
|
||||
if (`SELECT @@binlog_format = 'ROW'`)
|
||||
{
|
||||
--skip Neither MIXED nor STATEMENT binlog format
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--source include/have_log_bin.inc
|
||||
|
||||
-- require r/have_binlog_format_row.require
|
||||
disable_query_log;
|
||||
show variables like 'binlog_format';
|
||||
enable_query_log;
|
||||
if (`SELECT @@binlog_format != 'ROW'`)
|
||||
{
|
||||
--skip Not ROW format
|
||||
}
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
--source include/have_log_bin.inc
|
||||
source include/have_log_bin.inc;
|
||||
|
||||
|
||||
if (`SELECT @@binlog_format = 'MIXED'`)
|
||||
{
|
||||
--skip Neither ROW nor STATEMENT binlog format
|
||||
}
|
||||
|
||||
-- require r/have_binlog_format_statement.require
|
||||
--disable_query_log
|
||||
--replace_result ROW STATEMENT
|
||||
show variables like 'binlog_format';
|
||||
--enable_query_log
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--source include/have_log_bin.inc
|
||||
|
||||
-- require r/have_binlog_format_statement.require
|
||||
disable_query_log;
|
||||
show variables like 'binlog_format';
|
||||
enable_query_log;
|
||||
if (`SELECT @@binlog_format != 'STATEMENT'`)
|
||||
{
|
||||
--skip Not STATEMENT format
|
||||
}
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
Variable_name Value
|
||||
binlog_format MIXED
|
|
@ -1,2 +0,0 @@
|
|||
Variable_name Value
|
||||
binlog_format ROW
|
|
@ -1,2 +0,0 @@
|
|||
Variable_name Value
|
||||
binlog_format STATEMENT
|
|
@ -0,0 +1,13 @@
|
|||
##############################################################################
|
||||
#
|
||||
# List the test cases that are to be disabled temporarily.
|
||||
#
|
||||
# Separate the test case name and the comment with ':'.
|
||||
#
|
||||
# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
|
||||
#
|
||||
# Do not use any TAB characters for whitespace.
|
||||
#
|
||||
##############################################################################
|
||||
partition_value_myisam : CAST() in partitioning function is currently not supported
|
||||
partition_value_innodb : CAST() in partitioning function is currently not supported
|
|
@ -1 +0,0 @@
|
|||
--loose-skip-plugin-ndbcluster
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
if (!`SELECT count(*) FROM information_schema.engines WHERE
|
||||
support = 'NO' AND engine = 'innodb'`){
|
||||
skip Needs innodb engine;
|
||||
skip Needs compiled-in and disabled innodb engine;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue