mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge 10.2 into 10.3
main.derived_cond_pushdown: Move all 10.3 tests to the end, trim trailing white space, and add an "End of 10.3 tests" marker. Add --sorted_result to tests where the ordering is not deterministic. main.win_percentile: Add --sorted_result to tests where the ordering is no longer deterministic.
This commit is contained in:
@ -19,6 +19,9 @@ sub skip_combinations {
|
||||
# don't run tests for the wrong platform
|
||||
$skip{'include/platform.combinations'} = [ (IS_WINDOWS) ? 'unix' : 'win' ];
|
||||
|
||||
$skip{'include/maybe_debug.combinations'} =
|
||||
[ defined $::mysqld_variables{'debug-dbug'} ? 'release' : 'debug' ];
|
||||
|
||||
# and for the wrong word size
|
||||
# check for exact values, in case the default changes to be small everywhere
|
||||
my $longsysvar= $::mysqld_variables{'max-binlog-stmt-cache-size'};
|
||||
@ -29,9 +32,6 @@ sub skip_combinations {
|
||||
die "unknown value max-binlog-stmt-cache-size=$longsysvar" unless $val_map{$longsysvar};
|
||||
$skip{'include/word_size.combinations'} = [ $val_map{$longsysvar} ];
|
||||
|
||||
$skip{'include/maybe_debug.combinations'} =
|
||||
[ defined $::mysqld_variables{'debug-dbug'} ? 'release' : 'debug' ];
|
||||
|
||||
# as a special case, disable certain include files as a whole
|
||||
$skip{'include/not_embedded.inc'} = 'Not run for embedded server'
|
||||
if $::opt_embedded_server;
|
||||
|
Reference in New Issue
Block a user