Merge. (0001121c) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/fulltext.result

+28 −0

Original line number	Diff line number	Diff line
		@@ -469,3 +469,31 @@ SELECT * FROM t1 WHERE MATCH(a) AGAINST ('"aaaa"' IN BOOLEAN MODE);
		a
		aaaaa aaaa
		DROP TABLE t1;
		CREATE TABLE t1 (a VARCHAR(255), b INT, FULLTEXT(a), KEY(b));
		INSERT INTO t1 VALUES('test', 1),('test', 1),('test', 1),('test', 1),
		('test', 1),('test', 2),('test', 3),('test', 4);
		EXPLAIN SELECT * FROM t1
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 fulltext b,a a 0 1 Using where
		EXPLAIN SELECT * FROM t1 USE INDEX(a)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 fulltext a a 0 1 Using where
		EXPLAIN SELECT * FROM t1 FORCE INDEX(a)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 fulltext a a 0 1 Using where
		EXPLAIN SELECT * FROM t1 IGNORE INDEX(a)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ref b b 5 const 4 Using where
		EXPLAIN SELECT * FROM t1 USE INDEX(b)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ref b b 5 const 4 Using where
		EXPLAIN SELECT * FROM t1 FORCE INDEX(b)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ref b b 5 const 4 Using where
		DROP TABLE t1;

mysql-test/t/fulltext.test

+27 −0

Original line number	Diff line number	Diff line
		@@ -396,3 +396,30 @@ SELECT * FROM t1 WHERE MATCH(a) AGAINST ('"aaaa"' IN BOOLEAN MODE);
		DROP TABLE t1;

		# End of 4.1 tests

		#
		# BUG#38842 - Fix for 25951 seems incorrect
		#
		CREATE TABLE t1 (a VARCHAR(255), b INT, FULLTEXT(a), KEY(b));
		INSERT INTO t1 VALUES('test', 1),('test', 1),('test', 1),('test', 1),
		('test', 1),('test', 2),('test', 3),('test', 4);

		EXPLAIN SELECT * FROM t1
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;

		EXPLAIN SELECT * FROM t1 USE INDEX(a)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;

		EXPLAIN SELECT * FROM t1 FORCE INDEX(a)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;

		EXPLAIN SELECT * FROM t1 IGNORE INDEX(a)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;

		EXPLAIN SELECT * FROM t1 USE INDEX(b)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;

		EXPLAIN SELECT * FROM t1 FORCE INDEX(b)
		WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;

		DROP TABLE t1;

sql/item_func.cc

+3 −1

Original line number	Diff line number	Diff line
		@@ -5024,7 +5024,9 @@ bool Item_func_match::fix_index()
		for (keynr=0 ; keynr < table->s->keys ; keynr++)
		{
		if ((table->key_info[keynr].flags & HA_FULLTEXT) &&
		(table->s->keys_in_use.is_set(keynr)))
		(flags & FT_BOOL ? table->keys_in_use_for_query.is_set(keynr) :
		table->s->keys_in_use.is_set(keynr)))

		{
		ft_to_key[fts]=keynr;
		ft_cnt[fts]=0;