mirror of
https://github.com/MariaDB/server.git
synced 2025-11-15 09:02:33 +03:00
73e253370b
manually resolved conflicts: Text conflict in client/mysqltest.c Contents conflict in mysql-test/include/have_bug25714.inc Text conflict in mysql-test/include/have_ndbapi_examples.inc Text conflict in mysql-test/mysql-test-run.pl Text conflict in mysql-test/suite/parts/inc/partition_check_drop.inc Text conflict in mysql-test/suite/parts/inc/partition_layout.inc Text conflict in mysql-test/suite/parts/inc/partition_layout_check1.inc Text conflict in mysql-test/suite/parts/inc/partition_layout_check2.inc Text conflict in mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter1_1_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter1_2_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter2_myisam.result Text conflict in mysql-test/suite/parts/r/partition_alter3_innodb.result Text conflict in mysql-test/suite/parts/r/partition_alter3_myisam.result Text conflict in mysql-test/suite/parts/r/partition_basic_innodb.result Text conflict in mysql-test/suite/parts/r/partition_basic_myisam.result Text conflict in mysql-test/suite/parts/r/partition_basic_symlink_myisam.result Text conflict in mysql-test/suite/parts/r/partition_engine_myisam.result Text conflict in mysql-test/suite/parts/r/partition_syntax_myisam.result Text conflict in mysql-test/suite/rpl_ndb/t/disabled.def Text conflict in mysql-test/t/disabled.def
17 lines
745 B
Modula-2
17 lines
745 B
Modula-2
##############################################################################
|
|
#
|
|
# 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.
|
|
#
|
|
##############################################################################
|
|
|
|
rpl_ndb_circular : Bug#33849 COMMIT event missing in cluster circular replication.
|
|
rpl_ndb_circular_simplex : Bug#33849 COMMIT event missing in cluster circular replication.
|
|
rpl_row_basic_7ndb : Bug#38369 rpl_ndb.rpl_row_basic_7ndb fails
|
|
rpl_ndb_circular_2ch : Bug#33849 COMMIT event missing in cluster circular replication.
|