diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-07-29 18:06:46 +0000 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-07-29 18:06:46 +0000 |
| commit | 123187dfed9b50e89c2970006fef9eebb2ec99e7 (patch) | |
| tree | 197835cde1a679dca3defec6dbd06ecd2eac7341 /storage/rocksdb/mysql-test/rocksdb_sys_vars | |
| parent | ff0ae68eae0e097e0c2a768553cee8c411a541b2 (diff) | |
| download | mariadb-git-123187dfed9b50e89c2970006fef9eebb2ec99e7.tar.gz | |
Fix the merge of rocksdb_sys_vars test suite
Diffstat (limited to 'storage/rocksdb/mysql-test/rocksdb_sys_vars')
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb_sys_vars/include/rocksdb_sys_var.inc | 7 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_update_cf_options_basic.test | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/include/rocksdb_sys_var.inc b/storage/rocksdb/mysql-test/rocksdb_sys_vars/include/rocksdb_sys_var.inc index eeb49e077a4..6ba93026674 100644 --- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/include/rocksdb_sys_var.inc +++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/include/rocksdb_sys_var.inc @@ -17,13 +17,6 @@ if (!$suppress_default_value) SELECT @start_session_value; } } -SELECT @start_global_value; -if ($session) -{ - --eval SET @start_session_value = @@session.$sys_var - SELECT @start_session_value; -} -} if (!$read_only) { diff --git a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_update_cf_options_basic.test b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_update_cf_options_basic.test index 15d5d870ae6..0e675dafed3 100644 --- a/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_update_cf_options_basic.test +++ b/storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_update_cf_options_basic.test @@ -1,4 +1,5 @@ --source include/have_rocksdb.inc +--source include/have_partition.inc call mtr.add_suppression("MyRocks: NULL is not a valid option for updates to column family settings."); call mtr.add_suppression("Invalid cf options, '=' expected *"); @@ -91,4 +92,4 @@ SELECT @@global.rocksdb_update_cf_options; USE test; -DROP TABLE t1;
\ No newline at end of file +DROP TABLE t1; |