WL#1509 Pack values of non-sorted fields in the sort buffer

New, complete patch, after pull from trunk.

Author: Tor Didriksen

mysql-test/r/filesort_merge.result

@@ -0,0 +1,60 @@
+CREATE TABLE t1 (
+id int NOT NULL auto_increment PRIMARY KEY,
+b int NOT NULL,
+c datetime NOT NULL,
+INDEX idx_b(b),
+INDEX idx_c(c)
+) ENGINE=InnoDB;
+CREATE TABLE t2 (
+b int NOT NULL auto_increment PRIMARY KEY,
+c datetime NOT NULL
+) ENGINE= MyISAM;
+INSERT INTO t2(c) VALUES ('2007-01-01');
+INSERT INTO t2(c) SELECT c FROM t2;
+INSERT INTO t2(c) SELECT c FROM t2;
+INSERT INTO t2(c) SELECT c FROM t2;
+INSERT INTO t2(c) SELECT c FROM t2;
+INSERT INTO t2(c) SELECT c FROM t2;
+INSERT INTO t2(c) SELECT c FROM t2;
+INSERT INTO t2(c) SELECT c FROM t2;
+INSERT INTO t2(c) SELECT c FROM t2;
+INSERT INTO t2(c) SELECT c FROM t2;
+INSERT INTO t2(c) SELECT c FROM t2;
+INSERT INTO t1(b,c) SELECT b,c FROM t2;
+UPDATE t2 SET c='2007-01-02';
+INSERT INTO t1(b,c) SELECT b,c FROM t2;
+UPDATE t2 SET c='2007-01-03';
+INSERT INTO t1(b,c) SELECT b,c FROM t2;
+set @@sort_buffer_size=8192;
+Warnings:
+Warning	1292	Truncated incorrect sort_buffer_size value: '8192'
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+3072
+EXPLAIN
+SELECT COUNT(*) FROM t1 FORCE INDEX(idx_b, idx_c)
+WHERE (c >= '2007-01-02' AND c <= '2007-01-03') OR b >= 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	NULL	index_merge	idx_b,idx_c	idx_c,idx_b	5,4	NULL	#	100.00	Using sort_union(idx_c,idx_b); Using where
+Warnings:
+Note	1003	/* select#1 */ select count(0) AS `COUNT(*)` from `test`.`t1` FORCE INDEX (`idx_c`) FORCE INDEX (`idx_b`) where (((`test`.`t1`.`c` >= '2007-01-02') and (`test`.`t1`.`c` <= '2007-01-03')) or (`test`.`t1`.`b` >= 1))
+SELECT COUNT(*) FROM t1 FORCE INDEX(idx_b, idx_c)
+WHERE (c >= '2007-01-02' AND c <= '2007-01-03') OR b >= 1;
+COUNT(*)
+3072
+set @@sort_buffer_size=default;
+DROP TABLE t1,t2;
+set optimizer_switch='semijoin=off';
+set optimizer_switch='materialization=off';
+CREATE TABLE t1 (topic BIGINT NOT NULL DEFAULT 0);
+SET @@session.sort_buffer_size=32768;
+SELECT * from t1 WHERE topic IN
+(SELECT topic FROM t1 GROUP BY topic HAVING topic < 2000)
+LIMIT 2
+;
+topic
+1370
+1369
+SET @@session.sort_buffer_size=DEFAULT;
+drop table t1;
+set optimizer_switch=default;

mysql-test/r/filesort_pack.result

@@ -0,0 +1,28 @@
+CREATE TABLE t1 (
+id int(10) unsigned NOT NULL auto_increment,
+k int(10) unsigned NOT NULL default '0',
+c char(120) NOT NULL default '',
+pad char(60) NOT NULL default '',
+PRIMARY KEY (id),
+KEY k (k)
+) engine=innodb;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+SET @@session.sort_buffer_size=32768;
+FLUSH STATUS;
+SHOW SESSION STATUS LIKE 'Sort%';
+Variable_name	Value
+Sort_merge_passes	0
+Sort_range	0
+Sort_rows	0
+Sort_scan	0
+SELECT c FROM t1 WHERE id between 2 and 1002 ORDER BY c;
+SHOW SESSION STATUS LIKE 'Sort%';
+Variable_name	Value
+Sort_merge_passes	0
+Sort_range	1
+Sort_rows	139
+Sort_scan	0
+SET @@session.sort_buffer_size=DEFAULT;
+DROP TABLE t1;

mysql-test/r/order_by_sortkey.result

@@ -156,4 +156,18 @@ Sort_merge_passes	0
 Sort_range	0
 Sort_rows	100
 Sort_scan	1
-DROP TABLE t1, tmp;
+FLUSH STATUS;
+CREATE TABLE t2 (f1 int);
+INSERT INTO t2 VALUES (0), (0);
+SELECT * FROM t2 where f1 =
+(SELECT f2 from t1 where t1.f1 = t2.f1 ORDER BY f1 LIMIT 1);
+f1
+0
+0
+SHOW SESSION STATUS LIKE 'Sort%';
+Variable_name	Value
+Sort_merge_passes	0
+Sort_range	0
+Sort_rows	2
+Sort_scan	2
+DROP TABLE t1, t2, tmp;