Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

BitKeeper/etc/ignore:
  auto-union
Docs/manual.texi:
  Auto merged

.bzrignore

@@ -34,6 +34,7 @@ BitKeeper/tmp/bkr3sAHD
 BitKeeper/tmp/gone
 COPYING
 COPYING.LIB
+Docs/#manual.texi#
 Docs/INSTALL-BINARY
 Docs/include.texi
 Docs/manual.aux
@@ -56,6 +57,7 @@ Docs/manual_letter.ps
 Docs/manual_toc.html
 Docs/my_sys.doc
 Docs/mysql.info
+Docs/texi2dvi.out
 INSTALL-SOURCE
 Logs/*
 MIRRORS
@@ -180,6 +182,7 @@ gmon.out
 heap/hp_test1
 heap/hp_test2
 include/my_config.h
+include/my_global.h
 include/mysql_version.h
 include/widec.h
 innobase/conftest.s1
@@ -419,4 +422,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-Docs/#manual.texi#

BitKeeper/triggers/post-commit

@@ -4,6 +4,7 @@
 TO=dev-public@mysql.com
 FROM=$USER@mysql.com
 INTERNALS=internals@lists.mysql.com
+DOCS=docs@mysql.com
 LIMIT=10000
 
 if [ "$REAL_EMAIL" = "" ]
@@ -17,10 +18,14 @@ BK_STATUS=$BK_STATUS$BK_COMMIT
 
 if [ "$BK_STATUS" = OK ]
 then 
+
+#++
+# dev-public@
+#--
  echo "Commit successful, notifying developers at $TO"
  (
    cat <<EOF
-List-ID: <bk.mysql>
+List-ID: <bk.mysql-4.0>
 From: $FROM
 To: $TO
 Subject: bk commit - 4.0 tree
@@ -29,10 +34,14 @@ EOF
   bk changes -v -r+
   bk cset -r+ -d
  ) | head -n $LIMIT | /usr/sbin/sendmail -t
+
+#++
+# internals@ mail
+#--
  echo "Notifying internals list at $INTERNALS"
  (
    cat <<EOF
-List-ID: <bk.mysql>
+List-ID: <bk.mysql-4.0>
 From: $FROM
 To: $INTERNALS
 Subject: bk commit into 4.0 tree
@@ -47,6 +56,27 @@ EOF
   bk changes -v -r+
   bk cset -r+ -d
  ) | head -n $LIMIT | /usr/sbin/sendmail -t
+
+#++
+# docs@ mail
+#--
+ bk changes -v -r+ | grep -q Docs/manual.texi
+ if [ $? == 0 ]
+ then
+  echo "Notifying docs list at $DOCS"
+  (
+    cat <<EOF
+List-ID: <bk.mysql-4.0>
+From: $FROM
+To: $DOCS
+Subject: bk commit - 4.0 tree (Manual)
+
+EOF
+  bk changes -v -r+
+  bk cset -r+ -d
+ ) | head -n $LIMIT | /usr/sbin/sendmail -t
+ fi
+
 else
  echo "commit failed because '$BK_STATUS', sorry life is hard..." 
 fi

Docs/bk.txt

@@ -55,5 +55,4 @@ Their developers, and especially the president of the company Larry McVoy really
 like MySQL and are very anxious to help us. Make sure it is obvious that you
 work for MySQL, of course. And, of course, do not bug them with little things
 that you can figure out on your own or with my help - they were nice to offer us
-support, but we should not abuse it.
-
+support, but we should not abuse it.
\ No newline at end of file

client/mysql.cc

@@ -22,7 +22,7 @@
  *   Andi Gutmans <andi@zend.com>
  *   Zeev Suraski <zeev@zend.com>
  *   Jani Tolonen <jani@mysql.com>
- *   Matt Wagner  <mwagner@mysql.com>
+ *   Matt Wagner  <matt@mysql.com>
  *   Jeremy Cole  <jcole@mysql.com>
  *   Tonu Samuel  <tonu@mysql.com>
  *

myisam/ft_boolean_search.c

@@ -123,7 +123,7 @@ void _ftb_parse_query(FTB *ftb, byte **start, byte *end,
         ftbe->up=up;
         ftbe->ythresh=0;
         ftbe->docid=HA_POS_ERROR;
-        if (ftbw->yesno > 0) up->ythresh++;
+        if (ftbe->yesno > 0) up->ythresh++;
         _ftb_parse_query(ftb, start, end, ftbe, depth+1,
                          (param.yesno<0 ? depth+1 : ndepth));
         break;

mysql-test/r/fulltext.result

@@ -45,6 +45,9 @@ select * from t1 where MATCH(a,b) AGAINST("+search +(support vector)" IN BOOLEAN
 a	b
 MySQL has now support	for full-text search
 Full-text search in MySQL	implements vector space model
+select * from t1 where MATCH(a,b) AGAINST("+search -(support vector)" IN BOOLEAN MODE);
+a	b
+Function MATCH ... AGAINST()	is used to do a search
 delete from t1 where a like "MySQL%";
 drop table t1;
 CREATE TABLE t1 (

mysql-test/t/fulltext.test

@@ -20,6 +20,7 @@ select * from t1 where MATCH(a,b) AGAINST("sear*" IN BOOLEAN MODE);
 select * from t1 where MATCH(a,b) AGAINST("+support +collections" IN BOOLEAN MODE);
 select * from t1 where MATCH(a,b) AGAINST("+search" IN BOOLEAN MODE);
 select * from t1 where MATCH(a,b) AGAINST("+search +(support vector)" IN BOOLEAN MODE);
+select * from t1 where MATCH(a,b) AGAINST("+search -(support vector)" IN BOOLEAN MODE);
 delete from t1 where a like "MySQL%";
 drop table t1;