summaryrefslogtreecommitdiff
path: root/storage/rocksdb
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2019-05-16 20:28:00 +0400
committerSergey Vojtovich <svoj@mariadb.org>2019-05-16 20:28:49 +0400
commitb546e92a6bbda2126eb7ec170080c52feaf31fa2 (patch)
treefa720c5de63636b523dec9706065ae8f1bb515cc /storage/rocksdb
parentef04a7123a7beed5bf20736a191785be8210e242 (diff)
downloadmariadb-git-b546e92a6bbda2126eb7ec170080c52feaf31fa2.tar.gz
Fixed rocksdb.mariadb_plugin on Windows
Diffstat (limited to 'storage/rocksdb')
-rw-r--r--storage/rocksdb/mysql-test/rocksdb/t/mariadb_plugin.test4
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/mariadb_plugin.test b/storage/rocksdb/mysql-test/rocksdb/t/mariadb_plugin.test
index fbf4c81584b..0cf56c0cbd5 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/mariadb_plugin.test
+++ b/storage/rocksdb/mysql-test/rocksdb/t/mariadb_plugin.test
@@ -1,5 +1,6 @@
--source include/have_log_bin.inc
--source include/have_binlog_format_row.inc
+--source include/not_windows.inc
--echo #
--echo # MDEV-14843: Assertion `s_tx_list.size() == 0' failed in myrocks::Rdb_transaction::term_mutex
@@ -25,7 +26,8 @@ UNINSTALL SONAME 'ha_rocksdb';
SELECT ENGINE, SUPPORT FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='ROCKSDB';
disconnect con1;
# Unfortunately this is the only more or less reliable way to wait until
-# connection done ha_close_connections().
+# connection done ha_close_connections(). It doesn't work on Windows due
+# to different thread handling.
let $wait_condition= SELECT VARIABLE_VALUE=1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='Threads_cached';
--source include/wait_condition.inc