bk commit into 4.1 tree (svoj:1.2252)

[svoj]

Below is the list of changes that have just been committed into a local
4.1 repository of svoj. When svoj 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
  1.2252 05/05/09 16:10:48 svoj@stripped +3 -0
  Merge

  mysql-test/t/innodb.test
    1.68 05/05/09 14:13:08 svoj@stripped +10 -10
    Auto merged

  mysql-test/r/innodb.result
    1.98 05/05/09 14:13:08 svoj@stripped +4 -4
    Auto merged

  BitKeeper/etc/logging_ok
    1.390 05/05/09 14:12:12 svoj@stripped +0 -1
    auto-union

# 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:	svoj
# Host:	axe.(none)
# Root:	/home/svoj/devel/mysql/bk/mysql-4.1/RESYNC

--- 1.97/mysql-test/r/innodb.result	2005-05-06 18:25:49 +05:00
+++ 1.98/mysql-test/r/innodb.result	2005-05-09 14:13:08 +05:00
@@ -1643,3 +1643,7 @@
 concat(a, b)
 11113333
 drop table t1;
+CREATE TABLE t1 ( a char(10) ) ENGINE=InnoDB;
+SELECT a FROM t1 WHERE MATCH (a) AGAINST ('test' IN BOOLEAN MODE);
+The used table type doesn't support FULLTEXT indexes
+DROP TABLE t1;

--- 1.67/mysql-test/t/innodb.test	2005-05-06 18:25:49 +05:00
+++ 1.68/mysql-test/t/innodb.test	2005-05-09 14:13:08 +05:00
@@ -1177,3 +1177,13 @@
 insert into t1 values ('1111', '3333');
 select distinct concat(a, b) from t1;
 drop table t1;
+
+#
+# BUG#7709 test case - Boolean fulltext query against unsupported 
+#                      engines does not fail
+#
+
+CREATE TABLE t1 ( a char(10) ) ENGINE=InnoDB;
+--error 1214;
+SELECT a FROM t1 WHERE MATCH (a) AGAINST ('test' IN BOOLEAN MODE);
+DROP TABLE t1;