Commit 689273af authored Feb 23, 2001 by serg@serg.mysql.com

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

parents 9ac867fd 20cede8d

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		mwagner@evoq.mwagner.org
		heikki@donna.mysql.fi
		serg@serg.mysql.com

mysql-test/r/fulltext_cache.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ ssde df s fsda sad er um chocolate Snickers 6 0
		aaaaaaaaa dsaass de Bife 7 0
		aaaaaaaaa dsaass de Pizza de Salmao 8 0
		q item id x
		aaaaaaaaa dsaass de sushi 1 0
		aaaaaaaaa dsaass de sushi 1 1.92378665219675
		aaaaaaaaa dsaass de Bolo de Chocolate 2 0
		aaaaaaaaa dsaass de Feijoada 3 0
		aaaaaaaaa dsaass de Mousse de Chocolate 4 0

sql/sql_select.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -473,8 +473,8 @@ mysql_select(THD thd,TABLE_LIST tables,List<Item> &fields,COND *conds,
		(group && order) \|\|
		test(select_options & OPTION_BUFFER_RESULT)));

		make_join_readinfo(&join,
		(select_options & SELECT_DESCRIBE) \| SELECT_USE_CACHE);
		make_join_readinfo(&join, (select_options & SELECT_DESCRIBE) \|
		(ftfuncs.elements ? 0 : SELECT_USE_CACHE)); // No cache for MATCH

		/* Need to tell Innobase that to play it safe, it should fetch all
		columns of the tables: this is because MySQL