revision-id: 0fad97a9ecbcb6a68ae396ea6f7a1dd4d933279c parent(s): 261d4755f4418d3a1b4dadf8d1ed5098ae3aa92f committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-15 15:34:06 +0300 message: Post-merge fixes: add a suppression for rocksdb.skip_validate_tmP_table --- storage/rocksdb/mysql-test/rocksdb/r/skip_validate_tmp_table.result | 1 + storage/rocksdb/mysql-test/rocksdb/t/skip_validate_tmp_table.test | 3 +++ 2 files changed, 4 insertions(+) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/skip_validate_tmp_table.result b/storage/rocksdb/mysql-test/rocksdb/r/skip_validate_tmp_table.result index d324793..92906f2 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/skip_validate_tmp_table.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/skip_validate_tmp_table.result @@ -3,6 +3,7 @@ show tables; Tables_in_test #mysql50#t1#sql-test t1 +call mtr.add_suppression('Invalid .old.. table or database name .t1#sql-test.'); set session debug_dbug="+d,gen_sql_table_name"; rename table t1 to t2; set session debug_dbug= "-d,gen_sql_table_name"; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/skip_validate_tmp_table.test b/storage/rocksdb/mysql-test/rocksdb/t/skip_validate_tmp_table.test index 80c366d2..c432146 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/skip_validate_tmp_table.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/skip_validate_tmp_table.test @@ -12,6 +12,9 @@ create table t1 (pk int primary key) engine=rocksdb; show tables; +# MariaDB produces a warning: +call mtr.add_suppression('Invalid .old.. table or database name .t1#sql-test.'); + # This will append '#sql-test' to the end of new name set session debug_dbug="+d,gen_sql_table_name"; rename table t1 to t2;