You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

65 lines
2.3 KiB

fixes for test failures and small collateral changes mysql-test/lib/My/Test.pm: somehow with "print" we get truncated writes sometimes mysql-test/suite/perfschema/r/digest_table_full.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/dml_handler.result: host table is not ported over yet mysql-test/suite/perfschema/r/information_schema.result: host table is not ported over yet mysql-test/suite/perfschema/r/nesting.result: this differs, because we don't rewrite general log queries, and multi-statement packets are logged as a one entry. this result file is identical to what mysql-5.6.5 produces with the --log-raw option. mysql-test/suite/perfschema/r/relaylog.result: MariaDB modifies the binlog index file directly, while MySQL 5.6 has a feature "crash-safe binlog index" and modifies a special "crash-safe" shadow copy of the index file and then moves it over. That's why this test shows "NONE" index file writes in MySQL and "MANY" in MariaDB. mysql-test/suite/perfschema/r/server_init.result: MariaDB initializes the "manager" resources from the "manager" thread, and starts this thread only when --flush-time is not 0. MySQL 5.6 initializes "manager" resources unconditionally on server startup. mysql-test/suite/perfschema/r/stage_mdl_global.result: this differs, because MariaDB disables query cache when query_cache_size=0. MySQL does not do that, and this causes useless mutex locks and waits. mysql-test/suite/perfschema/r/statement_digest.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_consumers.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_long_query.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result: will be updated to match 5.6 when alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni and anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y are merged mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result: will be updated to match 5.6 when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y is merged
13 years ago
fixes for test failures and small collateral changes mysql-test/lib/My/Test.pm: somehow with "print" we get truncated writes sometimes mysql-test/suite/perfschema/r/digest_table_full.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/dml_handler.result: host table is not ported over yet mysql-test/suite/perfschema/r/information_schema.result: host table is not ported over yet mysql-test/suite/perfschema/r/nesting.result: this differs, because we don't rewrite general log queries, and multi-statement packets are logged as a one entry. this result file is identical to what mysql-5.6.5 produces with the --log-raw option. mysql-test/suite/perfschema/r/relaylog.result: MariaDB modifies the binlog index file directly, while MySQL 5.6 has a feature "crash-safe binlog index" and modifies a special "crash-safe" shadow copy of the index file and then moves it over. That's why this test shows "NONE" index file writes in MySQL and "MANY" in MariaDB. mysql-test/suite/perfschema/r/server_init.result: MariaDB initializes the "manager" resources from the "manager" thread, and starts this thread only when --flush-time is not 0. MySQL 5.6 initializes "manager" resources unconditionally on server startup. mysql-test/suite/perfschema/r/stage_mdl_global.result: this differs, because MariaDB disables query cache when query_cache_size=0. MySQL does not do that, and this causes useless mutex locks and waits. mysql-test/suite/perfschema/r/statement_digest.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_consumers.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_long_query.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result: will be updated to match 5.6 when alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni and anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y are merged mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result: will be updated to match 5.6 when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y is merged
13 years ago
  1. package My::Suite::Main;
  2. use My::Platform;
  3. @ISA = qw(My::Suite);
  4. sub skip_combinations {
  5. my @combinations;
  6. # disable innodb/xtradb combinatons for configurations that were not built
  7. push @combinations, 'innodb_plugin' unless $ENV{HA_INNODB_SO};
  8. # if something is compiled in, it's xtradb. innodb is MODULE_ONLY:
  9. push @combinations, 'xtradb' unless $::mysqld_variables{'innodb'} eq "ON";
  10. push @combinations, 'innodb';
  11. # XtraDB is RECOMPILE_FOR_EMBEDDED, ha_xtradb.so cannot work with embedded server
  12. push @combinations, 'xtradb_plugin' if not $ENV{HA_XTRADB_SO}
  13. or $::opt_embedded_server;
  14. my %skip = ( 'include/have_innodb.combinations' => [ @combinations ],
  15. 'include/have_xtradb.combinations' => [ @combinations ]);
  16. # don't run tests for the wrong platform
  17. $skip{'include/platform.combinations'} = [ (IS_WINDOWS) ? 'unix' : 'win' ];
  18. $skip{'include/maybe_debug.combinations'} =
  19. [ defined $::mysqld_variables{'debug-dbug'} ? 'release' : 'debug' ];
  20. # as a special case, disable certain include files as a whole
  21. $skip{'include/not_embedded.inc'} = 'Not run for embedded server'
  22. if $::opt_embedded_server;
  23. $skip{'include/have_debug.inc'} = 'Requires debug build'
  24. unless defined $::mysqld_variables{'debug-dbug'};
  25. $skip{'include/have_ssl_communication.inc'} =
  26. $skip{'include/have_ssl_crypto_functs.inc'} = 'Requires SSL'
  27. unless defined $::mysqld_variables{'ssl-ca'};
  28. $skip{'include/have_example_plugin.inc'} = 'Need example plugin'
  29. unless $ENV{HA_EXAMPLE_SO};
  30. $skip{'include/not_windows.inc'} = 'Requires not Windows' if IS_WINDOWS;
  31. $skip{'t/plugin_loaderr.test'} = 'needs compiled-in innodb'
  32. unless $::mysqld_variables{'innodb'} eq "ON";
  33. # disable tests that use ipv6, if unsupported
  34. sub ipv6_ok() {
  35. use Socket;
  36. return 0 unless socket my $sock, PF_INET6, SOCK_STREAM, getprotobyname('tcp');
  37. # eval{}, if there's no Socket::sockaddr_in6 at all, old Perl installation
  38. eval { connect $sock, sockaddr_in6(7, Socket::IN6ADDR_LOOPBACK) };
  39. return $@ eq "";
  40. }
  41. $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok();
  42. $skip{'t/openssl_6975.test'} = 'no or too old openssl'
  43. unless ! IS_WINDOWS and ! system "openssl ciphers TLSv1.2 >/dev/null 2>&1";
  44. %skip;
  45. }
  46. bless { };