Commit f72cec1b authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents e3c56fd4 4f8bbaed

mysql-test/r/subselect.result

+13 −0
Original line number Diff line number Diff line
@@ -1899,3 +1899,16 @@ select t000.a, count(*) `C` FROM t1 t000 GROUP BY t000.a HAVING count(*) > ALL ( 
a	C

1	1

drop table t1,t2;

create table t1 (a int not null auto_increment primary key, b varchar(40), fulltext(b));

insert into t1 (b) values ('ball'),('ball games'), ('games'), ('foo'), ('foobar'), ('Serg'), ('Sergei'),('Georg'), ('Patrik'),('Hakan');

create table t2 (a int);

insert into t2 values (1),(3),(2),(7);

select a,b from t1 where match(b) against ('Ball') > 0;

a	b

1	ball

2	ball games

select a from t2 where a in (select a from t1 where match(b) against ('Ball') > 0);

a

1

2

drop table t1,t2;

mysql-test/t/subselect.test

+13 −0
Original line number Diff line number Diff line
@@ -1222,3 +1222,16 @@ CREATE TABLE `t2` ( `b` int(11) default NULL, `a` int(11) default NULL) ENGINE=M 
insert into t2 values (1,2);

select t000.a, count(*) `C` FROM t1 t000 GROUP BY t000.a HAVING count(*) > ALL (SELECT count(*) FROM t2 t001 WHERE t001.a=1);

drop table t1,t2;



#

# BUG#4769 - fulltext in subselect

#

create table t1 (a int not null auto_increment primary key, b varchar(40), fulltext(b)); 

insert into t1 (b) values ('ball'),('ball games'), ('games'), ('foo'), ('foobar'), ('Serg'), ('Sergei'),('Georg'), ('Patrik'),('Hakan'); 

create table t2 (a int); 

insert into t2 values (1),(3),(2),(7); 

select a,b from t1 where match(b) against ('Ball') > 0; 

select a from t2 where a in (select a from t1 where match(b) against ('Ball') > 0); 

drop table t1,t2;

sql/Makefile.am

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ 
                        @innodb_system_libs@ \

			@ndbcluster_libs@ @ndbcluster_system_libs@ \

			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@

mysqld_DEPENDENCIES = 	@ndbcluster_libs@ @ndbcluster_system_libs@

noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \

			item_strfunc.h item_timefunc.h item_uniq.h \

			item_create.h item_subselect.h item_row.h \

sql/sql_select.cc

+6 −4
Original line number Diff line number Diff line
@@ -729,6 +729,10 @@ JOIN::optimize() 
		     (select_lex->ftfunc_list->elements ?

		      SELECT_NO_JOIN_CACHE : 0));



  /* Perform FULLTEXT search before all regular searches */

  if (!(select_options & SELECT_DESCRIBE))

    init_ftfuncs(thd, select_lex, test(order));



  /*

    is this simple IN subquery?

  */
@@ -849,8 +853,6 @@ JOIN::optimize() 
  }

  having= 0;



  /* Perform FULLTEXT search before all regular searches */

  init_ftfuncs(thd, select_lex, test(order));

  /* Create a tmp table if distinct or if the sort is too complicated */

  if (need_tmp)

  {