[Commits] Rev 3821: more results fixed in file:///home/bell/maria/bzr/work-maria-10.0-serg/

sanja at montyprogram.com sanja at montyprogram.com
Thu Aug 8 12:22:41 EEST 2013


At file:///home/bell/maria/bzr/work-maria-10.0-serg/

------------------------------------------------------------
revno: 3821
revision-id: sanja at montyprogram.com-20130808092238-7tr53zi0s1dr438r
parent: sanja at montyprogram.com-20130807150043-rimv5sc15rd977j1
committer: sanja at montyprogram.com
branch nick: work-maria-10.0-serg
timestamp: Thu 2013-08-08 12:22:38 +0300
message:
  more results fixed
-------------- next part --------------
=== modified file 'mysql-test/suite/innodb_fts/r/fulltext_misc.result'
--- a/mysql-test/suite/innodb_fts/r/fulltext_misc.result	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/fulltext_misc.result	2013-08-08 09:22:38 +0000
@@ -9,7 +9,7 @@ WHERE 1 > ALL((SELECT 1 FROM t1 JOIN t1
 WHERE t1.f1 GROUP BY t1.f1));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	index	NULL	f1_2	8	NULL	1	Using index
-2	SUBQUERY	t1	fulltext	f1	f1	0	NULL	1	Using where
+2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 2	SUBQUERY	a	index	NULL	f1_2	8	NULL	1	Using index
 PREPARE stmt FROM
 'EXPLAIN SELECT 1 FROM t1
@@ -19,12 +19,12 @@ PREPARE stmt FROM
 EXECUTE stmt;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	index	NULL	f1_2	8	NULL	1	Using index
-2	SUBQUERY	t1	fulltext	f1	f1	0	NULL	1	Using where
+2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 2	SUBQUERY	a	index	NULL	f1_2	8	NULL	1	Using index
 EXECUTE stmt;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	index	NULL	f1_2	8	NULL	1	Using index
-2	SUBQUERY	t1	fulltext	f1	f1	0	NULL	1	Using where
+2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 2	SUBQUERY	a	index	NULL	f1_2	8	NULL	1	Using index
 DEALLOCATE PREPARE stmt;
 PREPARE stmt FROM
@@ -35,12 +35,12 @@ PREPARE stmt FROM
 EXECUTE stmt;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	index	NULL	f1_2	8	NULL	1	Using index
-2	SUBQUERY	t1	fulltext	f1	f1	0	NULL	1	Using where
+2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 2	SUBQUERY	a	index	NULL	f1_2	8	NULL	1	Using index
 EXECUTE stmt;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	index	NULL	f1_2	8	NULL	1	Using index
-2	SUBQUERY	t1	fulltext	f1	f1	0	NULL	1	Using where
+2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 2	SUBQUERY	a	index	NULL	f1_2	8	NULL	1	Using index
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1;
@@ -144,11 +144,11 @@ INSERT INTO t2 VALUES (1),(2);
 EXPLAIN EXTENDED
 SELECT * FROM t1 UNION SELECT * FROM t1 ORDER BY a + 12;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
-2	UNION	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using temporary; Using filesort
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
+2	UNION	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
+NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using filesort
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` union /* select#2 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` order by (`a` + 12)
+Note	1003	select `test`.`t1`.`a` AS `a` from `test`.`t1` union select `test`.`t1`.`a` AS `a` from `test`.`t1` order by (`a` + 12)
 # Should not crash
 SELECT * FROM t1 UNION SELECT * FROM t1 ORDER BY a + 12;
 a
@@ -168,13 +168,13 @@ EXPLAIN EXTENDED
 SELECT * FROM t1 UNION SELECT * FROM t1
 ORDER BY (SELECT a FROM t2 WHERE b = 12);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
-2	UNION	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
+2	UNION	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
+NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using filesort
 3	DEPENDENT SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using temporary; Using filesort
 Warnings:
-Note	1276	Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #2
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` union /* select#2 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` order by (/* select#3 */ select `test`.`t1`.`a` from `test`.`t2` where (`test`.`t2`.`b` = 12))
+Note	1276	Field or reference 'a' of SELECT #3 was resolved in SELECT #-1
+Note	1003	select `test`.`t1`.`a` AS `a` from `test`.`t1` union select `test`.`t1`.`a` AS `a` from `test`.`t1` order by (select `a` from `test`.`t2` where (`test`.`t2`.`b` = 12))
 # Should not crash
 SELECT * FROM t1 UNION SELECT * FROM t1
 ORDER BY (SELECT a FROM t2 WHERE b = 12);

=== removed file 'mysql-test/suite/innodb_fts/r/fulltext_order_by.reject'
--- a/mysql-test/suite/innodb_fts/r/fulltext_order_by.reject	2013-08-07 10:39:58 +0000
+++ b/mysql-test/suite/innodb_fts/r/fulltext_order_by.reject	1970-01-01 00:00:00 +0000
@@ -1,179 +0,0 @@
-DROP TABLE IF EXISTS t1,t2,t3;
-CREATE TABLE t1 (
-a INT AUTO_INCREMENT PRIMARY KEY,
-message CHAR(20),
-FULLTEXT(message)
-) ENGINE = InnoDB comment = 'original testcase by sroussey at network54.com';
-INSERT INTO t1 (message) VALUES ("Testing"),("table"),("testbug"),
-("steve"),("is"),("cool"),("steve is cool");
-ANALYZE TABLE t1;
-SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) FROM t1 WHERE MATCH (message) AGAINST ('steve');
-a	FORMAT(MATCH (message) AGAINST ('steve'),6)
-4	0.296010
-7	0.296010
-SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) FROM t1 WHERE MATCH (message) AGAINST ('steve');
-a	MATCH (message) AGAINST ('steve' IN BOOLEAN MODE)
-4	0.2960100471973419
-7	0.2960100471973419
-SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) FROM t1 WHERE MATCH (message) AGAINST ('steve' IN BOOLEAN MODE);
-a	FORMAT(MATCH (message) AGAINST ('steve'),6)
-4	0.296010
-7	0.296010
-SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) FROM t1 WHERE MATCH (message) AGAINST ('steve' IN BOOLEAN MODE);
-a	MATCH (message) AGAINST ('steve' IN BOOLEAN MODE)
-4	0.2960100471973419
-7	0.2960100471973419
-SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY a;
-a	FORMAT(MATCH (message) AGAINST ('steve'),6)
-4	0.296010
-7	0.296010
-SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) FROM t1 WHERE MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) ORDER BY a;
-a	MATCH (message) AGAINST ('steve' IN BOOLEAN MODE)
-4	0.2960100471973419
-7	0.2960100471973419
-SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) FROM t1 WHERE a in (2,7,4) and MATCH (message) AGAINST ('steve') ORDER BY a DESC;
-a	FORMAT(MATCH (message) AGAINST ('steve'),6)
-7	0.296010
-4	0.296010
-SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) FROM t1 WHERE a in (2,7,4) and MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) ORDER BY a DESC;
-a	MATCH (message) AGAINST ('steve' IN BOOLEAN MODE)
-7	0.2960100471973419
-4	0.2960100471973419
-SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) FROM t1 WHERE a=7 and MATCH (message) AGAINST ('steve') ORDER BY 1;
-a	FORMAT(MATCH (message) AGAINST ('steve'),6)
-7	0.296010
-SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) FROM t1 WHERE a=7 and MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) ORDER BY 1;
-a	MATCH (message) AGAINST ('steve' IN BOOLEAN MODE)
-7	0.2960100471973419
-SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) as rel FROM t1 ORDER BY rel;
-a	rel
-6	0.000000
-3	0.000000
-1	0.000000
-5	0.000000
-2	0.000000
-7	0.296010
-4	0.296010
-SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) as rel FROM t1 ORDER BY rel;
-a	rel
-6	0
-1	0
-2	0
-3	0
-5	0
-7	0.2960100471973419
-4	0.2960100471973419
-alter table t1 add key m (message);
-ANALYZE TABLE t1;
-explain SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	message	message	0		1	Using where; Using filesort
-SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message desc;
-message
-steve is cool
-steve
-drop table t1;
-CREATE TABLE t1 (
-a INT AUTO_INCREMENT PRIMARY KEY,
-message CHAR(20),
-FULLTEXT(message)
-) ENGINE = InnoDB;
-INSERT INTO t1 (message) VALUES ("testbug"),("testbug foobar");
-ANALYZE TABLE t1;
-SELECT a, MATCH (message) AGAINST ('t* f*' IN BOOLEAN MODE) as rel FROM t1;
-a	rel
-1	0.000000001885928302414186
-2	0.0906190574169159
-SELECT a, MATCH (message) AGAINST ('t* f*' IN BOOLEAN MODE) as rel FROM t1 ORDER BY rel,a;
-a	rel
-1	0.000000001885928302414186
-2	0.0906190574169159
-drop table t1;
-CREATE TABLE t1 (
-id int(11) NOT NULL auto_increment,
-thread int(11) NOT NULL default '0',
-beitrag longtext NOT NULL,
-PRIMARY KEY  (id),
-KEY thread (thread),
-FULLTEXT KEY beitrag (beitrag)
-) ENGINE =InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=7923 ;
-CREATE TABLE t2 (
-id int(11) NOT NULL auto_increment,
-text varchar(100) NOT NULL default '',
-PRIMARY KEY  (id),
-KEY text (text)
-) ENGINE = InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=63 ;
-CREATE TABLE t3 (
-id int(11) NOT NULL auto_increment,
-forum int(11) NOT NULL default '0',
-betreff varchar(70) NOT NULL default '',
-PRIMARY KEY  (id),
-KEY forum (forum),
-FULLTEXT KEY betreff (betreff)
-) ENGINE = InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=996 ;
-select a.text, b.id, b.betreff
-from 
-t2 a inner join t3 b on a.id = b.forum inner join
-t1 c on b.id = c.thread
-where 
-match(b.betreff) against ('+abc' in boolean mode)
-group by a.text, b.id, b.betreff
-union
-select a.text, b.id, b.betreff
-from 
-t2 a inner join t3 b on a.id = b.forum inner join
-t1 c on b.id = c.thread
-where 
-match(c.beitrag) against ('+abc' in boolean mode)
-group by 
-a.text, b.id, b.betreff
-order by 
-match(b.betreff) against ('+abc' in boolean mode) desc;
-ERROR 42000: Incorrect usage/placement of 'MATCH()'
-select a.text, b.id, b.betreff
-from 
-t2 a inner join t3 b on a.id = b.forum inner join
-t1 c on b.id = c.thread
-where 
-match(b.betreff) against ('+abc' in boolean mode)
-union
-select a.text, b.id, b.betreff
-from 
-t2 a inner join t3 b on a.id = b.forum inner join
-t1 c on b.id = c.thread
-where 
-match(c.beitrag) against ('+abc' in boolean mode)
-order by 
-match(b.betreff) against ('+abc' in boolean mode) desc;
-ERROR 42000: Incorrect usage/placement of 'MATCH()'
-select a.text, b.id, b.betreff
-from 
-t2 a inner join t3 b on a.id = b.forum inner join
-t1 c on b.id = c.thread
-where 
-match(b.betreff) against ('+abc' in boolean mode)
-union
-select a.text, b.id, b.betreff
-from 
-t2 a inner join t3 b on a.id = b.forum inner join
-t1 c on b.id = c.thread
-where 
-match(c.beitrag) against ('+abc' in boolean mode)
-order by 
-match(betreff) against ('+abc' in boolean mode) desc;
-ERROR 42000: Incorrect usage/placement of 'MATCH()'
-(select b.id, b.betreff from t3 b) union 
-(select b.id, b.betreff from t3 b) 
-order by match(betreff) against ('+abc' in boolean mode) desc;
-id	betreff
-(select b.id, b.betreff from t3 b) union 
-(select b.id, b.betreff from t3 b) 
-order by match(betreff) against ('+abc') desc;
-ERROR HY000: Can't find FULLTEXT index matching the column list
-select distinct b.id, b.betreff from t3 b 
-order by match(betreff) against ('+abc' in boolean mode) desc;
-id	betreff
-select b.id, b.betreff from t3 b group by b.id+1 
-order by match(betreff) against ('+abc' in boolean mode) desc;
-id	betreff
-drop table t1,t2,t3;

=== modified file 'mysql-test/suite/innodb_fts/r/fulltext_order_by.result'
--- a/mysql-test/suite/innodb_fts/r/fulltext_order_by.result	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/fulltext_order_by.result	2013-08-08 09:22:38 +0000
@@ -48,12 +48,12 @@ a	MATCH (message) AGAINST ('steve' IN BO
 SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) as rel FROM t1 ORDER BY rel;
 a	rel
 1	0.000000
-2	0.000000
-3	0.000000
 5	0.000000
+2	0.000000
 6	0.000000
-4	0.296010
+3	0.000000
 7	0.296010
+4	0.296010
 SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) as rel FROM t1 ORDER BY rel;
 a	rel
 1	0
@@ -67,7 +67,7 @@ alter table t1 add key m (message);
 ANALYZE TABLE t1;
 explain SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	message	message	0	NULL	1	Using where; Using filesort
+1	SIMPLE	t1	fulltext	message	message	0		1	Using where; Using filesort
 SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message desc;
 message
 steve is cool



More information about the commits mailing list