bk commit into 5.1 tree (sergefp:1.2234) BUG#14940

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.1 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-31 22:22:01+04:00, sergefp@stripped +1 -0
  BUG#14940: Post-merge fixes: update test results

  mysql-test/r/binlog_row_blackhole.result@stripped, 2006-07-31 22:21:57+04:00,
sergefp@stripped +2 -2
    BUG#14940: Post-merge fixes: update test results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	pslp.mylan
# Root:	/home/psergey/mysql-5.1-bug14940-push

--- 1.6/mysql-test/r/binlog_row_blackhole.result	2006-07-31 22:22:07 +04:00
+++ 1.7/mysql-test/r/binlog_row_blackhole.result	2006-07-31 22:22:07 +04:00
@@ -70,8 +70,8 @@
 Only MyISAM tables	support collections
 Full-text indexes	are called collections
 explain extended select * from t1 where MATCH(a,b) AGAINST ("collections");
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	Using where
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	fulltext	a	a	0		1	100.00	Using where
 Warnings:
 Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where
(match `test`.`t1`.`a`,`test`.`t1`.`b` against (_latin1'collections'))
 select * from t1 where MATCH(a,b) AGAINST ("indexes");