Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

2 files changed, 13 insertions, 1 deletions

diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index a616b09781f..e8a4d87f680 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -21,3 +21,7 @@ t2	CREATE TABLE `t2` (
   FULLTEXT KEY `tix` (`inhalt`)
 ) TYPE=MyISAM
 ticket	inhalt
+ticket	inhalt
+3	foobar
+ticket	inhalt
+3	foobar
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index 6614a81a94c..064219c6ad3 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -42,7 +42,10 @@ ticket2.id = ttxt.ticket
 WHERE t1.id = ticket2.ticket and match(ttxt.inhalt) against ('foobar');
 
 INSERT INTO t1 VALUES (3,3);
-select t1.id FROM t2 as ttxt,t1 INNER JOIN t1 as ticket2 ON ticket2.id = ttxt.ticket WHERE t1.id = ticket2.ticket and match(ttxt.inhalt) against ('foobar');
+select t1.id FROM t2 as ttxt,t1
+INNER JOIN t1 as ticket2 ON ticket2.id = ttxt.ticket
+WHERE t1.id = ticket2.ticket and
+      match(ttxt.inhalt) against ('foobar');
 
 # Check that we get 'fulltext' index in SHOW CREATE
 
@@ -53,4 +56,9 @@ show create table t2;
 
 select * from t2 where MATCH inhalt AGAINST (NULL);
 
+# MATCH in HAVING (pretty useless, but still it should work)
+
+select * from t2 where  MATCH inhalt AGAINST ('foobar');
+select * from t2 having MATCH inhalt AGAINST ('foobar');
+
 drop table t1,t2;