From 3674c363a7e77e534c3e0d28659dc614c53fbcbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Mon, 6 Apr 2015 12:45:35 +0300 Subject: [PATCH 1/3] MDEV-7918: A number of tests fail in valgrind builder with "InnoDB: Error: Requested state 6 current state 4 old_state 4" Problem with this state transfer is that different state transfers are protected with different mutexes. --- storage/innobase/include/buf0buf.ic | 7 ------- storage/xtradb/include/buf0buf.ic | 7 ------- 2 files changed, 14 deletions(-) diff --git a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic index 842aa6758cd6d..aed0330760167 100644 --- a/storage/innobase/include/buf0buf.ic +++ b/storage/innobase/include/buf0buf.ic @@ -275,13 +275,6 @@ buf_page_set_state( } #endif /* UNIV_DEBUG */ bpage->state = state; -#ifdef UNIV_DEBUG - if( buf_page_get_state(bpage) != state) { - fprintf(stderr, "InnoDB: Error: Requested state %d current state %d old_state %d\n", - state, buf_page_get_state(bpage), old_state); - } -#endif - ut_ad(buf_page_get_state(bpage) == state); } /*********************************************************************//** diff --git a/storage/xtradb/include/buf0buf.ic b/storage/xtradb/include/buf0buf.ic index b4cbba29f3c35..b522751833f71 100644 --- a/storage/xtradb/include/buf0buf.ic +++ b/storage/xtradb/include/buf0buf.ic @@ -279,13 +279,6 @@ buf_page_set_state( #endif /* UNIV_DEBUG */ bpage->state = state; -#ifdef UNIV_DEBUG - if( buf_page_get_state(bpage) != state) { - fprintf(stderr, "InnoDB: Error: Requested state %d current state %d old_state %d\n", - state, buf_page_get_state(bpage), old_state); - } -#endif - ut_ad(buf_page_get_state(bpage) == state); } /*********************************************************************//** From eb83e9405f9f537ff49f6d325942133460aa510c Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Mon, 6 Apr 2015 19:13:33 +0300 Subject: [PATCH 2/3] MDEV-7917 main.log_tables fails sporadically in buildbot #2 mysql.slow_log table has an extra column in 10.1, so the test table copy should too -- added the column. --- mysql-test/r/log_tables.result | 3 ++- mysql-test/t/log_tables.test | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 1a4ee280f0892..dd2beb87974b8 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -542,7 +542,8 @@ CREATE TABLE `db_17876.slow_log_data` ( `insert_id` int(11) default NULL, `server_id` int(11) default NULL, `sql_text` mediumtext, -`thread_id` bigint(21) unsigned default NULL +`thread_id` bigint(21) unsigned default NULL, +`rows_affected` int(11) default NULL ); CREATE TABLE `db_17876.general_log_data` ( `event_time` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, diff --git a/mysql-test/t/log_tables.test b/mysql-test/t/log_tables.test index 1a32ca8aaeef7..28f6e6dd829dc 100644 --- a/mysql-test/t/log_tables.test +++ b/mysql-test/t/log_tables.test @@ -727,7 +727,8 @@ CREATE TABLE `db_17876.slow_log_data` ( `insert_id` int(11) default NULL, `server_id` int(11) default NULL, `sql_text` mediumtext, - `thread_id` bigint(21) unsigned default NULL + `thread_id` bigint(21) unsigned default NULL, + `rows_affected` int(11) default NULL ); CREATE TABLE `db_17876.general_log_data` ( From 7d9e94e2e6c32b906d1d8469e58bc04b8da1c121 Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Mon, 6 Apr 2015 19:37:37 +0300 Subject: [PATCH 3/3] MDEV-7916: main.analyze_format_json fails in buildbot on labrador Make the test work on case insensitive FS --- mysql-test/r/analyze_format_json.result | 10 +++++----- mysql-test/t/analyze_format_json.test | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/analyze_format_json.result b/mysql-test/r/analyze_format_json.result index 48ebceb1959af..2c339042f4325 100644 --- a/mysql-test/r/analyze_format_json.result +++ b/mysql-test/r/analyze_format_json.result @@ -412,7 +412,7 @@ create table t0 (a int); INSERT INTO t0 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); create table t1 (a int); INSERT INTO t1 select * from t0; -analyze format=json (select * from t1 A where a<5) union (select * from t1 B where a in (2,3)); +analyze format=json (select * from t1 tbl1 where a<5) union (select * from t1 tbl2 where a in (2,3)); ANALYZE { "query_block": { @@ -428,7 +428,7 @@ ANALYZE "r_loops": 1, "r_total_time_ms": "REPLACED", "table": { - "table_name": "A", + "table_name": "tbl1", "access_type": "ALL", "r_loops": 1, "rows": 10, @@ -436,7 +436,7 @@ ANALYZE "r_total_time_ms": "REPLACED", "filtered": 100, "r_filtered": 50, - "attached_condition": "(A.a < 5)" + "attached_condition": "(tbl1.a < 5)" } } }, @@ -446,7 +446,7 @@ ANALYZE "r_loops": 1, "r_total_time_ms": "REPLACED", "table": { - "table_name": "B", + "table_name": "tbl2", "access_type": "ALL", "r_loops": 1, "rows": 10, @@ -454,7 +454,7 @@ ANALYZE "r_total_time_ms": "REPLACED", "filtered": 100, "r_filtered": 20, - "attached_condition": "(B.a in (2,3))" + "attached_condition": "(tbl2.a in (2,3))" } } } diff --git a/mysql-test/t/analyze_format_json.test b/mysql-test/t/analyze_format_json.test index 7a3c11b13c55f..816d83a62f03a 100644 --- a/mysql-test/t/analyze_format_json.test +++ b/mysql-test/t/analyze_format_json.test @@ -145,7 +145,7 @@ create table t1 (a int); INSERT INTO t1 select * from t0; --replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/ -analyze format=json (select * from t1 A where a<5) union (select * from t1 B where a in (2,3)); +analyze format=json (select * from t1 tbl1 where a<5) union (select * from t1 tbl2 where a in (2,3)); drop table t0, t1;