Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt (4bf2408e) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/innodb_mysql.result

+97 −0

Original line number	Diff line number	Diff line
		@@ -1114,4 +1114,101 @@ c b
		3 1
		3 2
		DROP TABLE t1;
		CREATE TABLE t1 (a INT, b INT, PRIMARY KEY (a), INDEX b (b)) ENGINE=InnoDB;
		INSERT INTO t1(a,b) VALUES (1,1), (2,2), (3,2);
		EXPLAIN SELECT * FROM t1 WHERE b=2 ORDER BY a ASC;
		id 1
		select_type SIMPLE
		table t1
		type ref
		possible_keys b
		key b
		key_len 5
		ref const
		rows 1
		Extra Using where; Using index
		SELECT * FROM t1 WHERE b=2 ORDER BY a ASC;
		a b
		2 2
		3 2
		EXPLAIN SELECT * FROM t1 WHERE b=2 ORDER BY a DESC;
		id 1
		select_type SIMPLE
		table t1
		type ref
		possible_keys b
		key b
		key_len 5
		ref const
		rows 1
		Extra Using where; Using index
		SELECT * FROM t1 WHERE b=2 ORDER BY a DESC;
		a b
		3 2
		2 2
		EXPLAIN SELECT * FROM t1 ORDER BY b ASC, a ASC;
		id 1
		select_type SIMPLE
		table t1
		type index
		possible_keys NULL
		key b
		key_len 5
		ref NULL
		rows 3
		Extra Using index
		SELECT * FROM t1 ORDER BY b ASC, a ASC;
		a b
		1 1
		2 2
		3 2
		EXPLAIN SELECT * FROM t1 ORDER BY b DESC, a DESC;
		id 1
		select_type SIMPLE
		table t1
		type index
		possible_keys NULL
		key b
		key_len 5
		ref NULL
		rows 3
		Extra Using index
		SELECT * FROM t1 ORDER BY b DESC, a DESC;
		a b
		3 2
		2 2
		1 1
		EXPLAIN SELECT * FROM t1 ORDER BY b ASC, a DESC;
		id 1
		select_type SIMPLE
		table t1
		type index
		possible_keys NULL
		key b
		key_len 5
		ref NULL
		rows 3
		Extra Using index; Using filesort
		SELECT * FROM t1 ORDER BY b ASC, a DESC;
		a b
		1 1
		3 2
		2 2
		EXPLAIN SELECT * FROM t1 ORDER BY b DESC, a ASC;
		id 1
		select_type SIMPLE
		table t1
		type index
		possible_keys NULL
		key b
		key_len 5
		ref NULL
		rows 3
		Extra Using index; Using filesort
		SELECT * FROM t1 ORDER BY b DESC, a ASC;
		a b
		2 2
		3 2
		1 1
		DROP TABLE t1;
		End of 5.0 tests

mysql-test/r/type_bit.result

+15 −0

Original line number	Diff line number	Diff line
		@@ -657,4 +657,19 @@ b
		#
		#
		DROP TABLE t1;
		CREATE TABLE t1 (a int, b bit(2));
		INSERT INTO t1 VALUES (3, 2), (2, 3), (2, 0), (3, 2), (3, 1);
		SELECT COUNT(DISTINCT b) FROM t1 GROUP BY a;
		COUNT(DISTINCT b)
		2
		2
		DROP TABLE t1;
		create table t2 (a int, b bit(2), c char(10));
		INSERT INTO t2 VALUES (3, 2, 'two'), (2, 3, 'three'), (2, 0, 'zero'),
		(3, 2, 'two'), (3, 1, 'one');
		SELECT COUNT(DISTINCT b,c) FROM t2 GROUP BY a;
		COUNT(DISTINCT b,c)
		2
		2
		DROP TABLE t2;
		End of 5.0 tests

mysql-test/t/innodb_mysql.test

+23 −0

Original line number	Diff line number	Diff line
		@@ -937,4 +937,27 @@ SELECT c,b FROM t1 GROUP BY c,b;

		DROP TABLE t1;

		#
		# Bug #31001: ORDER BY DESC in InnoDB not working
		#
		CREATE TABLE t1 (a INT, b INT, PRIMARY KEY (a), INDEX b (b)) ENGINE=InnoDB;
		INSERT INTO t1(a,b) VALUES (1,1), (2,2), (3,2);

		#The two queries below should produce different results, but they don't.
		query_vertical EXPLAIN SELECT * FROM t1 WHERE b=2 ORDER BY a ASC;
		SELECT * FROM t1 WHERE b=2 ORDER BY a ASC;
		query_vertical EXPLAIN SELECT * FROM t1 WHERE b=2 ORDER BY a DESC;
		SELECT * FROM t1 WHERE b=2 ORDER BY a DESC;

		query_vertical EXPLAIN SELECT * FROM t1 ORDER BY b ASC, a ASC;
		SELECT * FROM t1 ORDER BY b ASC, a ASC;
		query_vertical EXPLAIN SELECT * FROM t1 ORDER BY b DESC, a DESC;
		SELECT * FROM t1 ORDER BY b DESC, a DESC;
		query_vertical EXPLAIN SELECT * FROM t1 ORDER BY b ASC, a DESC;
		SELECT * FROM t1 ORDER BY b ASC, a DESC;
		query_vertical EXPLAIN SELECT * FROM t1 ORDER BY b DESC, a ASC;
		SELECT * FROM t1 ORDER BY b DESC, a ASC;

		DROP TABLE t1;

		--echo End of 5.0 tests

mysql-test/t/type_bit.test

+14 −0

Original line number	Diff line number	Diff line
		@@ -304,4 +304,18 @@ SELECT b FROM t1 GROUP BY b;
		--disable_metadata
		DROP TABLE t1;

		#
		# BUG#30324 Wrong query result for COUNT(DISTINCT(bit_column))
		#
		CREATE TABLE t1 (a int, b bit(2));
		INSERT INTO t1 VALUES (3, 2), (2, 3), (2, 0), (3, 2), (3, 1);
		SELECT COUNT(DISTINCT b) FROM t1 GROUP BY a;
		DROP TABLE t1;

		create table t2 (a int, b bit(2), c char(10));
		INSERT INTO t2 VALUES (3, 2, 'two'), (2, 3, 'three'), (2, 0, 'zero'),
		(3, 2, 'two'), (3, 1, 'one');
		SELECT COUNT(DISTINCT b,c) FROM t2 GROUP BY a;
		DROP TABLE t2;

		--echo End of 5.0 tests

sql/item_sum.cc

+17 −0

Original line number	Diff line number	Diff line
		@@ -2464,6 +2464,23 @@ bool Item_sum_count_distinct::setup(THD *thd)
		count_field_types(select_lex, tmp_table_param, list, 0);
		tmp_table_param->force_copy_fields= force_copy_fields;
		DBUG_ASSERT(table == 0);
		/*
		Make create_tmp_table() convert BIT columns to BIGINT.
		This is needed because BIT fields store parts of their data in table's
		null bits, and we don't have methods to compare two table records, which
		is needed by Unique which is used when HEAP table is used.
		*/
		{
		List_iterator_fast<Item> li(list);
		Item *item;
		while ((item= li++))
		{
		if (item->type() == Item::FIELD_ITEM &&
		((Item_field*)item)->field->type() == FIELD_TYPE_BIT)
		item->marker=4;
		}
		}

		if (!(table= create_tmp_table(thd, tmp_table_param, list, (ORDER*) 0, 1,
		0,
		(select_lex->options \| thd->options),