Make win_big test specify only if Sort_merge_passes have happenedbb-10.2-vicentiu-window

The number is irrelevant and may differ by architecture. We are only
interested if it happened or not

2 files changed, 61 insertions, 24 deletions

diff --git a/mysql-test/r/win_big.result b/mysql-test/r/win_big.result
index 7ea044e702c..c8b27b9a1aa 100644
--- a/mysql-test/r/win_big.result
+++ b/mysql-test/r/win_big.result
@@ -18,9 +18,12 @@ select
 sum(b) over (order by a rows between 2 preceding and 2 following) as SUM_B
 from
 t10;
-show status like 'Sort_merge_passes';
-Variable_name	Value
-Sort_merge_passes	0
+select variable_name,
+case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+from information_schema.session_status
+where variable_name like 'Sort_merge_passes';
+variable_name	case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+SORT_MERGE_PASSES	NO PASSES
 set sort_buffer_size=1024;
 flush status;
 create table t22 as
@@ -28,9 +31,12 @@ select
 sum(b) over (order by a rows between 2 preceding and 2 following) as SUM_B
 from
 t10;
-show status like 'Sort_merge_passes';
-Variable_name	Value
-Sort_merge_passes	35
+select variable_name,
+case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+from information_schema.session_status
+where variable_name like 'Sort_merge_passes';
+variable_name	case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+SORT_MERGE_PASSES	WITH PASSES
 include/diff_tables.inc [t21, t22]
 drop table t21, t22;
 #################################################################
@@ -44,9 +50,12 @@ sum(b) over (order by a rows between 5 preceding and 5 following) as SUM_B2,
 sum(b) over (order by a rows between 20 preceding and 20 following) as SUM_B3
 from
 t10;
-show status like 'Sort_merge_passes';
-Variable_name	Value
-Sort_merge_passes	0
+select variable_name,
+case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+from information_schema.session_status
+where variable_name like 'Sort_merge_passes';
+variable_name	case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+SORT_MERGE_PASSES	NO PASSES
 set sort_buffer_size=1024;
 flush status;
 create table t22 as
@@ -56,9 +65,12 @@ sum(b) over (order by a rows between 5 preceding and 5 following) as SUM_B2,
 sum(b) over (order by a rows between 20 preceding and 20 following) as SUM_B3
 from
 t10;
-show status like 'Sort_merge_passes';
-Variable_name	Value
-Sort_merge_passes	35
+select variable_name,
+case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+from information_schema.session_status
+where variable_name like 'Sort_merge_passes';
+variable_name	case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+SORT_MERGE_PASSES	WITH PASSES
 include/diff_tables.inc [t21, t22]
 drop table t21, t22;
 #################################################################
@@ -72,9 +84,12 @@ a,
 sum(b) over (order by a range between 5000 preceding and 5000 following) as SUM_B1
 from
 t10;
-show status like 'Sort_merge_passes';
-Variable_name	Value
-Sort_merge_passes	0
+select variable_name,
+case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+from information_schema.session_status
+where variable_name like 'Sort_merge_passes';
+variable_name	case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+SORT_MERGE_PASSES	NO PASSES
 set sort_buffer_size=1024;
 flush status;
 create table t22 as
@@ -83,9 +98,12 @@ a,
 sum(b) over (order by a range between 5000 preceding and 5000 following) as SUM_B1
 from
 t10;
-show status like 'Sort_merge_passes';
-Variable_name	Value
-Sort_merge_passes	35
+select variable_name,
+case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+from information_schema.session_status
+where variable_name like 'Sort_merge_passes';
+variable_name	case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+SORT_MERGE_PASSES	WITH PASSES
 include/diff_tables.inc [t21, t22]
 drop table t21, t22;
 #################################################################
diff --git a/mysql-test/t/win_big.test b/mysql-test/t/win_big.test
index a0398126eb3..09c8d640b09 100644
--- a/mysql-test/t/win_big.test
+++ b/mysql-test/t/win_big.test
@@ -28,7 +28,10 @@ select
   sum(b) over (order by a rows between 2 preceding and 2 following) as SUM_B
 from
   t10;
-show status like 'Sort_merge_passes';
+select variable_name,
+       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+from information_schema.session_status
+where variable_name like 'Sort_merge_passes';
 
 set sort_buffer_size=1024;
 flush status;
@@ -37,7 +40,10 @@ select
   sum(b) over (order by a rows between 2 preceding and 2 following) as SUM_B
 from
   t10;
-show status like 'Sort_merge_passes';
+select variable_name,
+       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+from information_schema.session_status
+where variable_name like 'Sort_merge_passes';
 
 let $diff_tables= t21, t22;
 source include/diff_tables.inc;
@@ -54,7 +60,10 @@ select
   sum(b) over (order by a rows between 20 preceding and 20 following) as SUM_B3
 from
   t10;
-show status like 'Sort_merge_passes';
+select variable_name,
+       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+from information_schema.session_status
+where variable_name like 'Sort_merge_passes';
 
 set sort_buffer_size=1024;
 flush status;
@@ -65,7 +74,10 @@ select
   sum(b) over (order by a rows between 20 preceding and 20 following) as SUM_B3
 from
   t10;
-show status like 'Sort_merge_passes';
+select variable_name,
+       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+from information_schema.session_status
+where variable_name like 'Sort_merge_passes';
 
 let $diff_tables= t21, t22;
 source include/diff_tables.inc;
@@ -82,7 +94,11 @@ select
   sum(b) over (order by a range between 5000 preceding and 5000 following) as SUM_B1
 from
   t10;
-show status like 'Sort_merge_passes';
+
+select variable_name,
+       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+from information_schema.session_status
+where variable_name like 'Sort_merge_passes';
 
 set sort_buffer_size=1024;
 flush status;
@@ -92,7 +108,10 @@ select
   sum(b) over (order by a range between 5000 preceding and 5000 following) as SUM_B1
 from
   t10;
-show status like 'Sort_merge_passes';
+select variable_name,
+       case when variable_value > 0 then 'WITH PASSES' else 'NO PASSES' end
+from information_schema.session_status
+where variable_name like 'Sort_merge_passes';
 
 let $diff_tables= t21, t22;
 source include/diff_tables.inc;