Organize information in storage/rocksdb/mysql-test/rocksdb/t/disabled.def

1 files changed, 49 insertions, 44 deletions

diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
index d35d1bdaf94..3af1d99ff22 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
+++ b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
@@ -3,79 +3,84 @@
 ##  platforms and under valgrind are disabled from there.
 ##
 
+##
+##  Tests that are disabled in the upstream
+##
 cons_snapshot_serializable : Consistent read does not work on serializable
 level_read_uncommitted : Not supported
 level_serializable: Not supported
 
 
-# Tests that are (temporarily) disabled in MariaDB:
+##
+##  Tests that require FB/MySQL specific features for which there are
+##  no plans of ever porting them into MariaDB
+##
+optimizer_loose_index_scans: MariaDB doesnt support Skip Scan
+mysqldump : MariaDB's mysqldump doesn't support --print-ordering-key
+mysqldump2 : MariaDB's mysqldump doesn't support --print-ordering-key
+native_procedure : Not supported in MariaDB
 slow_query_log: MDEV-11480
 select_for_update_skip_locked_nowait: MDEV-11481
-rpl_read_free: MDEV-10976
-lock_wait_timeout_stats: MDEV-13404
 
-optimizer_loose_index_scans: MariaDB doesnt support Skip Scan
-
-# MDEV-11735: MyRocks: Gap Lock detector support
-gap_lock_issue254: MDEV-11735: MyRocks: Gap Lock detector support
-gap_lock_raise_error: MDEV-11735: MyRocks: Gap Lock detector support
 
-#
-# The idea of including RQG as a submodule and running RQG as part of 
-# MTR tests doesn't seem to be a good fit in MariaDB atm.
-#
-# The objection is that MTR tests are deterministic and can be run in 
-# a constrained environment.
-#
+##
+##  Tests that do not fit MariaDB's test environment. Upstream seems to test
+##  on boxes with much more RAM and CPU, some tests are more of a stress tests
+##  than functional tests or bug testcases.
+##
 rqg_examples : Test that use RQG are disabled
 rqg_runtime : Test that use RQG are disabled
 rqg_transactions : Test that use RQG are disabled
+allow_no_pk_concurrent_insert: stress test
+rocksdb_deadlock_stress_rc: stress test
+rocksdb_deadlock_stress_rr: stress test
 
-#
-# Temporarily disabled tests
-#
-information_schema : MariaRocks: requires GTIDs
-mysqlbinlog_gtid_skip_empty_trans_rocksdb : MariaRocks: requires GTIDs
-read_only_tx : MariaRocks: requires GTIDs
-rpl_row_triggers : MariaRocks: requires GTIDs
 
-trx_info_rpl : MariaRocks: @@rpl_skip_tx_api doesn't work, yet.
+##
+##  Tests which hit a problem elsewhere (Upstream, SQL layer, etc)
+##
+persistent_cache: Upstream RocksDB bug https://github.com/facebook/mysql-5.6/issues/579
+collation: Fails on gcc 4.8 and before,  MDEV-12433
+col_opt_zerofill: MDEV-14165: not MyRocks -problem in ps-protocol, happens in upstream too
 
-mysqldump : MariaRocks: MariaDB's mysqldump doesn't support --print-ordering-key
-mysqldump2 : MariaRocks: MariaDB's mysqldump doesn't support --print-ordering-key
 
+##
+##  Tests that require FB/MySQL specific features which MariaDB
+##  currently doesnt have but eventually might get:
+##
+gap_lock_issue254:    MDEV-11735: MyRocks: Gap Lock detector support
+gap_lock_raise_error: MDEV-11735: MyRocks: Gap Lock detector support
 show_engine : MariaRocks: MariaDB doesnt support SHOW ENGINE rocksdb TRANSACTION STATUS
 issue243_transactionStatus: MariaDB doesnt support SHOW ENGINE rocksdb TRANSACTION STATUS
-
 rpl_row_not_found : MariaDB doesnt support slave_exec_mode='SEMI_STRICT'
+ddl_high_priority: Needs fractional @@lock_wait_timeout
+deadlock_tracking : Needs SHOW ENGINE ROCKSDB TRANSACTION STATUS
+bytes_written: Needs I_S.TABLE_STATISTICS.IO_WRITE_BYTES
+trx_info_rpl : MariaRocks: @@rpl_skip_tx_api doesn't work, yet.
+rpl_read_free: MDEV-10976
+lock_wait_timeout_stats: MDEV-13404
 
-blind_delete_without_tx_api: MDEV-12286: rocksdb.blind_delete_without_tx_api test fails
-
-persistent_cache: Upstream RocksDB bug https://github.com/facebook/mysql-5.6/issues/579
-
-collation: Fails on gcc 4.8 and before,  MDEV-12433
 
-# See also storage/rocksdb/mysql-test/rocksdb/suite.pm
-# Running tests under valgrind is disabled there.
+##
+##  Test failures (in buildbot or else where)
+##
 
-allow_no_pk_concurrent_insert: stress test
-rocksdb_deadlock_stress_rc: stress test
-rocksdb_deadlock_stress_rr: stress test
+compact_deletes: MDEV-12663 : rocksdb.compact_deletes times out and causes other tests to fail
+blind_delete_without_tx_api: MDEV-12286: rocksdb.blind_delete_without_tx_api test fails
 
-# MDEV-12474 Regularly failing tests on Buildbot
 # Enabling these didn't seem to cause any trouble:
 # autoinc_vars_thread : MDEV-12474 Regularly fails on buildbot
 # unique_check : MDEV-12474 Regularly fails on buildbot
 # bloomfilter : MDEV-12474 Regularly fails on buildbot
 # unique_sec : Intermittent failures in BB
 
-compact_deletes: MDEV-12663 : rocksdb.compact_deletes times out and causes other tests to fail
-
-native_procedure : Not supported in MariaDB
 
-ddl_high_priority: Needs fractional @@lock_wait_timeout
-deadlock_tracking : Needs SHOW ENGINE ROCKSDB TRANSACTION STATUS
-bytes_written: Needs I_S.TABLE_STATISTICS.IO_WRITE_BYTES
+##
+## Tests that fail for some other reason
+##
+information_schema : MariaRocks: requires GTIDs
+mysqlbinlog_gtid_skip_empty_trans_rocksdb : MariaRocks: requires GTIDs
+read_only_tx : MariaRocks: requires GTIDs
+rpl_row_triggers : MariaRocks: requires GTIDs
 
-col_opt_zerofill: MDEV-14165: not MyRocks -problem in ps-protocol, happens in upstream too