diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-04-02 12:35:59 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-04-02 12:35:59 +0000 |
| commit | 96c48a0d89a1591996eaf9855414b5eb5cfb2d3b (patch) | |
| tree | 6fbf6408a931c1feaeace3581e39d596bcaf2403 | |
| parent | 9501c7d06edb2d5ee878be7c74e1c418059fa7eb (diff) | |
| download | mariadb-git-96c48a0d89a1591996eaf9855414b5eb5cfb2d3b.tar.gz | |
rocksdb - fix failing tests on Windows
5 files changed, 6 insertions, 0 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/autoinc_vars_thread_2.test b/storage/rocksdb/mysql-test/rocksdb/t/autoinc_vars_thread_2.test index 3c7d61aa15b..b64af16411b 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/autoinc_vars_thread_2.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/autoinc_vars_thread_2.test @@ -40,6 +40,7 @@ while ($i > 0) my $thr = $ENV{'ROCKSDB_THREAD'}; my $num = $ENV{'ROCKSDB_ROWS_PER_THREAD'}; open(my $fh, '>>', $fn) || die "perl open($fn): $!"; + binmode $fh; for (my $ii = 0; $ii < $num; $ii++) { print $fh "\\N\t$thr\n" diff --git a/storage/rocksdb/mysql-test/rocksdb/t/get_error_message.test b/storage/rocksdb/mysql-test/rocksdb/t/get_error_message.test index 31013b75f63..b4c9e2dae3a 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/get_error_message.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/get_error_message.test @@ -1,5 +1,6 @@ --source include/have_rocksdb.inc --source include/have_partition.inc +--source include/not_windows.inc # Data directory option not availablr # # Create tables with partitions and try to generate an error while creating diff --git a/storage/rocksdb/mysql-test/rocksdb/t/show_table_status.test b/storage/rocksdb/mysql-test/rocksdb/t/show_table_status.test index 29cc2ccfb5e..a293b9ee6b8 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/show_table_status.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/show_table_status.test @@ -1,4 +1,5 @@ --source include/have_rocksdb.inc +--source include/not_windows.inc # decorated database names is too long, exceeded OS limits # # SHOW TABLE STATUS statement diff --git a/storage/rocksdb/mysql-test/rocksdb/t/tbl_opt_data_index_dir.test b/storage/rocksdb/mysql-test/rocksdb/t/tbl_opt_data_index_dir.test index 1b3a1b144d0..99cb2253d94 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/tbl_opt_data_index_dir.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/tbl_opt_data_index_dir.test @@ -1,6 +1,8 @@ --source include/have_rocksdb.inc --source include/have_partition.inc +--source include/not_windows.inc + # # Check that when either DATA DIRECTORY or INDEX DIRECTORY are specified # then MyRocks returns an appropriate error. We don't support this diff --git a/storage/rocksdb/mysql-test/rocksdb/t/write_sync.test b/storage/rocksdb/mysql-test/rocksdb/t/write_sync.test index d508000bf8a..804889dcec9 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/write_sync.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/write_sync.test @@ -1,4 +1,5 @@ --source include/have_rocksdb.inc +--source include/not_windows.inc # MDEV-12427 SET GLOBAL rocksdb_write_disable_wal=false; SET GLOBAL rocksdb_write_ignore_missing_column_families=true; |