From 3cb28fad7ab6d4eaebe1656a35e1f68db65b834c Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Sat, 8 Apr 2017 06:37:54 +0400 Subject: [PATCH 1/3] "mtr myisam_views-big" failed with "Unknown VIEW" vs "Unknown table". Recording correct results. --- .../suite/funcs_1/r/myisam_views-big.result | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mysql-test/suite/funcs_1/r/myisam_views-big.result b/mysql-test/suite/funcs_1/r/myisam_views-big.result index b65375820552f..9296b9d98a289 100644 --- a/mysql-test/suite/funcs_1/r/myisam_views-big.result +++ b/mysql-test/suite/funcs_1/r/myisam_views-big.result @@ -4784,7 +4784,7 @@ CREATE VIEW v2 AS Select * from test.v1; ERROR 42S02: Table 'test.v1' doesn't exist DROP VIEW IF EXISTS v2; Warnings: -Note 1051 Unknown table 'test.v2' +Note 4067 Unknown VIEW: 'test.v2' Testcase 3.3.1.25 -------------------------------------------------------------------------------- @@ -8387,7 +8387,7 @@ Call sp1() ; ERROR 42000: PROCEDURE test.sp1 does not exist Drop view if exists test.v1 ; Warnings: -Note 1051 Unknown table 'test.v1' +Note 4067 Unknown VIEW: 'test.v1' Drop procedure sp1 ; ERROR 42000: PROCEDURE test.sp1 does not exist @@ -22984,12 +22984,12 @@ CREATE TABLE t1 ( f1 VARCHAR(1000) ) ENGINE = myisam ; CREATE VIEW v1 AS SELECT f1 FROM t1; DROP VIEW v1; DROP VIEW v1; -ERROR 42S02: Unknown table 'test.v1' +ERROR 42S02: Unknown VIEW: 'test.v1' CREATE VIEW v1 AS SELECT f1 FROM t1; DROP VIEW IF EXISTS v1; DROP VIEW IF EXISTS v1; Warnings: -Note 1051 Unknown table 'test.v1' +Note 4067 Unknown VIEW: 'test.v1' Testcase 3.3.1.68 -------------------------------------------------------------------------------- @@ -23001,31 +23001,31 @@ CREATE VIEW v1_base AS SELECT * FROM t1; CREATE VIEW v1_top AS SELECT * FROM v1_base; DROP VIEW v1_top ; DROP VIEW v1_top; -ERROR 42S02: Unknown table 'test.v1_top' +ERROR 42S02: Unknown VIEW: 'test.v1_top' CREATE VIEW v1_top AS SELECT * FROM v1_base; DROP VIEW v1_base ; DROP VIEW v1_base; -ERROR 42S02: Unknown table 'test.v1_base' +ERROR 42S02: Unknown VIEW: 'test.v1_base' DROP VIEW v1_top; CREATE VIEW v1_base AS SELECT * FROM t1; CREATE VIEW v1_top AS SELECT * FROM v1_base; DROP VIEW v1_top CASCADE ; DROP VIEW v1_top; -ERROR 42S02: Unknown table 'test.v1_top' +ERROR 42S02: Unknown VIEW: 'test.v1_top' CREATE VIEW v1_top AS SELECT * FROM v1_base; DROP VIEW v1_base CASCADE ; DROP VIEW v1_base; -ERROR 42S02: Unknown table 'test.v1_base' +ERROR 42S02: Unknown VIEW: 'test.v1_base' DROP VIEW v1_top; CREATE VIEW v1_base AS SELECT * FROM t1; CREATE VIEW v1_top AS SELECT * FROM v1_base; DROP VIEW v1_top RESTRICT ; DROP VIEW v1_top; -ERROR 42S02: Unknown table 'test.v1_top' +ERROR 42S02: Unknown VIEW: 'test.v1_top' CREATE VIEW v1_top AS SELECT * FROM v1_base; DROP VIEW v1_base RESTRICT ; DROP VIEW v1_base; -ERROR 42S02: Unknown table 'test.v1_base' +ERROR 42S02: Unknown VIEW: 'test.v1_base' DROP VIEW v1_top; Testcase 3.3.1.69, 3.3.1.70, 3.3.1.A5 From 311503f3284be2cea6ab8d059dd24f85908e8277 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Sat, 8 Apr 2017 07:05:01 +0400 Subject: [PATCH 2/3] storage/rocksdb/rdb_datadic.cc failed to compile on big endian machines (wrong usage of static_assert) --- storage/rocksdb/rdb_datadic.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/rocksdb/rdb_datadic.cc b/storage/rocksdb/rdb_datadic.cc index fd5424c2c230a..43b67210a12f8 100644 --- a/storage/rocksdb/rdb_datadic.cc +++ b/storage/rocksdb/rdb_datadic.cc @@ -1303,7 +1303,7 @@ static int rdb_unpack_floating_point( // On little-endian, swap the bytes around swap_func(dst, tmp); #else - static_assert(swap_func == nullptr, "Assuming that no swapping is needed."); + DBUG_ASSERT(swap_func == nullptr); #endif return UNPACK_SUCCESS; From 099e87e09082937889796a5f9f0c71984a2db5c0 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Sat, 8 Apr 2017 07:40:09 +0400 Subject: [PATCH 3/3] "mtr --embedded sysvars_server_embedded" failed. Recording new correct results. --- mysql-test/suite/sys_vars/r/sysvars_server_embedded.result | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index 8880c9f8ca991..19315c6e733d0 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -2867,9 +2867,9 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES SESSION_VALUE NULL -GLOBAL_VALUE 187 +GLOBAL_VALUE 189 GLOBAL_VALUE_ORIGIN COMPILE-TIME -DEFAULT_VALUE 187 +DEFAULT_VALUE 189 VARIABLE_SCOPE GLOBAL VARIABLE_TYPE BIGINT UNSIGNED VARIABLE_COMMENT Maximum number of statement instruments.