3573 Tor Didriksen 2011-11-08
Bug#11748783 37359: FILESORT CAN BE MORE EFFICIENT
Post-push fix: sort_buffer_size depends on platform (32 vs 64 bit)
modified:
mysql-test/suite/opt_trace/include/general.inc
mysql-test/suite/opt_trace/include/general2.inc
mysql-test/suite/opt_trace/include/subquery.inc
mysql-test/suite/opt_trace/r/general2_no_prot.result
mysql-test/suite/opt_trace/r/general2_ps_prot.result
mysql-test/suite/opt_trace/r/general_no_prot_none.result
mysql-test/suite/opt_trace/r/general_ps_prot_none.result
mysql-test/suite/opt_trace/r/subquery_no_prot.result
mysql-test/suite/opt_trace/r/subquery_ps_prot.result
3572 Marko Mäkelä 2011-11-08 [merge]
Merge mysql-5.5 to mysql-trunk.
modified:
storage/innobase/ibuf/ibuf0ibuf.c
=== modified file 'mysql-test/suite/opt_trace/include/general.inc'
--- a/mysql-test/suite/opt_trace/include/general.inc 2011-09-21 15:53:58 +0000
+++ b/mysql-test/suite/opt_trace/include/general.inc 2011-11-08 07:51:49 +0000
@@ -311,6 +311,7 @@ select * from information_schema.OPTIMIZ
# HAVING
select t1.a,avg(t2.c) as moyenne from t1, t2 where t2.c>-1
group by t1.a having moyenne<>0;
+--replace_regex /("sort_buffer_size":) [0-9]+/\1 NNN/
select trace from information_schema.OPTIMIZER_TRACE;
# impossible HAVING
select t1.a,avg(t2.c) as moyenne from t1, t2 where t2.c>-1
=== modified file 'mysql-test/suite/opt_trace/include/general2.inc'
--- a/mysql-test/suite/opt_trace/include/general2.inc 2011-09-21 15:53:58 +0000
+++ b/mysql-test/suite/opt_trace/include/general2.inc 2011-11-08 07:51:49 +0000
@@ -159,6 +159,7 @@ ORDER BY f2;
--echo Maps should say that t2 and t3 depend on t1
--echo (because of straight_join), they don't, this is
--echo bug#11766858 and bug#11752239
+--replace_regex /("sort_buffer_size":) [0-9]+/\1 NNN/
select TRACE from information_schema.OPTIMIZER_TRACE;
DROP TABLES t1,t2,t3;
@@ -171,6 +172,7 @@ DROP TABLES t1,t2,t3;
create table t1 (a int, b int);
insert into t1 values (1,1), (2,null), (3, 4);
select max(x) from (select sum(a) as x from t1 group by b) as teeone;
+--replace_regex /("sort_buffer_size":) [0-9]+/\1 NNN/
select TRACE from information_schema.OPTIMIZER_TRACE;
drop table t1;
@@ -614,6 +616,7 @@ SELECT SUM(alias2.col_varchar_nokey) , a
STRAIGHT_JOIN t2 AS alias2 ON alias2.pk = alias1.col_int_key WHERE alias1.pk
GROUP BY field2 ORDER BY alias1.col_int_key,alias2.pk ;
eval $query;
+--replace_regex /("sort_buffer_size":) [0-9]+/\1 NNN/
SELECT * FROM INFORMATION_SCHEMA.OPTIMIZER_TRACE;
DROP TABLE t1,t2;
=== modified file 'mysql-test/suite/opt_trace/include/subquery.inc'
--- a/mysql-test/suite/opt_trace/include/subquery.inc 2011-10-18 14:27:48 +0000
+++ b/mysql-test/suite/opt_trace/include/subquery.inc 2011-11-08 07:51:49 +0000
@@ -174,6 +174,7 @@ sq4_alias3.`col_varchar_nokey` <> alias1
alias1.`col_int_key` not in (214) group by field1,field2,field3,
field4,field5,field6;
+--replace_regex /("sort_buffer_size":) [0-9]+/\1 NNN/
select * from information_schema.optimizer_trace;
set optimizer_switch=@old_opt_switch;
drop table t1,t2,t3,t4,t5;
=== modified file 'mysql-test/suite/opt_trace/r/general2_no_prot.result'
--- a/mysql-test/suite/opt_trace/r/general2_no_prot.result 2011-11-07 15:32:36 +0000
+++ b/mysql-test/suite/opt_trace/r/general2_no_prot.result 2011-11-08 07:51:49 +0000
@@ -1119,7 +1119,7 @@ TRACE
"rows": 4,
"examined_rows": 4,
"number_of_tmp_files": 0,
- "sort_buffer_size": 252,
+ "sort_buffer_size": NNN,
"sort_mode": "<sort_key, rowid>"
} /* filesort_summary */
}
@@ -1355,7 +1355,7 @@ TRACE
"rows": 3,
"examined_rows": 3,
"number_of_tmp_files": 0,
- "sort_buffer_size": 273,
+ "sort_buffer_size": NNN,
"sort_mode": "<sort_key, rowid>"
} /* filesort_summary */
}
@@ -4862,7 +4862,7 @@ GROUP BY field2 ORDER BY alias1.col_int_
"rows": 8,
"examined_rows": 8,
"number_of_tmp_files": 0,
- "sort_buffer_size": 378,
+ "sort_buffer_size": NNN,
"sort_mode": "<sort_key, rowid>"
} /* filesort_summary */
}
=== modified file 'mysql-test/suite/opt_trace/r/general2_ps_prot.result'
--- a/mysql-test/suite/opt_trace/r/general2_ps_prot.result 2011-11-07 15:32:36 +0000
+++ b/mysql-test/suite/opt_trace/r/general2_ps_prot.result 2011-11-08 07:51:49 +0000
@@ -1137,7 +1137,7 @@ TRACE
"rows": 4,
"examined_rows": 4,
"number_of_tmp_files": 0,
- "sort_buffer_size": 252,
+ "sort_buffer_size": NNN,
"sort_mode": "<sort_key, rowid>"
} /* filesort_summary */
}
@@ -1373,7 +1373,7 @@ TRACE
"rows": 3,
"examined_rows": 3,
"number_of_tmp_files": 0,
- "sort_buffer_size": 273,
+ "sort_buffer_size": NNN,
"sort_mode": "<sort_key, rowid>"
} /* filesort_summary */
}
@@ -4915,7 +4915,7 @@ GROUP BY field2 ORDER BY alias1.col_int_
"rows": 8,
"examined_rows": 8,
"number_of_tmp_files": 0,
- "sort_buffer_size": 378,
+ "sort_buffer_size": NNN,
"sort_mode": "<sort_key, rowid>"
} /* filesort_summary */
}
=== modified file 'mysql-test/suite/opt_trace/r/general_no_prot_none.result'
--- a/mysql-test/suite/opt_trace/r/general_no_prot_none.result 2011-11-07 15:32:36 +0000
+++ b/mysql-test/suite/opt_trace/r/general_no_prot_none.result 2011-11-08 07:51:49 +0000
@@ -5835,7 +5835,7 @@ trace
"rows": 2,
"examined_rows": 2,
"number_of_tmp_files": 0,
- "sort_buffer_size": 252,
+ "sort_buffer_size": NNN,
"sort_mode": "<sort_key, rowid>"
} /* filesort_summary */
}
=== modified file 'mysql-test/suite/opt_trace/r/general_ps_prot_none.result'
--- a/mysql-test/suite/opt_trace/r/general_ps_prot_none.result 2011-11-07 15:32:36 +0000
+++ b/mysql-test/suite/opt_trace/r/general_ps_prot_none.result 2011-11-08 07:51:49 +0000
@@ -5793,7 +5793,7 @@ trace
"rows": 2,
"examined_rows": 2,
"number_of_tmp_files": 0,
- "sort_buffer_size": 252,
+ "sort_buffer_size": NNN,
"sort_mode": "<sort_key, rowid>"
} /* filesort_summary */
}
=== modified file 'mysql-test/suite/opt_trace/r/subquery_no_prot.result'
--- a/mysql-test/suite/opt_trace/r/subquery_no_prot.result 2011-11-07 15:32:36 +0000
+++ b/mysql-test/suite/opt_trace/r/subquery_no_prot.result 2011-11-08 07:51:49 +0000
@@ -1762,7 +1762,7 @@ field4,field5,field6 {
"rows": 0,
"examined_rows": 0,
"number_of_tmp_files": 0,
- "sort_buffer_size": 260,
+ "sort_buffer_size": NNN,
"sort_mode": "<sort_key, rowid>"
} /* filesort_summary */
}
=== modified file 'mysql-test/suite/opt_trace/r/subquery_ps_prot.result'
--- a/mysql-test/suite/opt_trace/r/subquery_ps_prot.result 2011-11-07 15:32:36 +0000
+++ b/mysql-test/suite/opt_trace/r/subquery_ps_prot.result 2011-11-08 07:51:49 +0000
@@ -1740,7 +1740,7 @@ field4,field5,field6 {
"rows": 0,
"examined_rows": 0,
"number_of_tmp_files": 0,
- "sort_buffer_size": 260,
+ "sort_buffer_size": NNN,
"sort_mode": "<sort_key, rowid>"
} /* filesort_summary */
}
No bundle (reason: useless for push emails).| Thread |
|---|
| • bzr push into mysql-trunk branch (tor.didriksen:3572 to 3573) Bug#11748783 | Tor Didriksen | 11 Nov |
