bk commit into 5.0 tree (svoj:1.2041)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 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.2041 06/02/07 15:19:13 svoj@april.(none) +3 -0
  Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
  into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0

  sql/sql_base.cc
    1.326 06/02/07 15:19:03 svoj@april.(none) +0 -2
    Manual merge.

  mysql-test/t/fulltext.test
    1.81 06/02/07 15:17:05 svoj@april.(none) +1 -0
    Manual merge.

  mysql-test/r/fulltext.result
    1.86 06/02/07 15:15:39 svoj@april.(none) +1 -0
    Manual merge.

  mysql-test/t/fulltext.test
    1.80 06/02/07 15:02:38 svoj@april.(none) +7 -8
    Maual merge

  mysql-test/r/fulltext.result
    1.85 06/02/07 15:00:21 svoj@april.(none) +0 -0
    SCCS merged

  mysql-test/r/fulltext.result
    1.84 06/02/07 14:58:31 svoj@april.(none) +7 -8
    e

# 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:	april.(none)
# Root:	/home/svoj/devel/mysql/merge/mysql-5.0/RESYNC

--- 1.83/mysql-test/r/fulltext.result	2006-01-13 21:25:07 +04:00
+++ 1.86/mysql-test/r/fulltext.result	2006-02-07 15:15:39 +04:00
@@ -445,3 +445,14 @@
   FULLTEXT KEY `a` (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
+CREATE TABLE t1 (a TEXT, FULLTEXT KEY(a));
+INSERT INTO t1 VALUES('test'),('test1'),('test');
+PREPARE stmt from "SELECT a, MATCH(a) AGAINST('test1 test') FROM t1 WHERE MATCH(a) AGAINST('test1 test')";
+EXECUTE stmt;
+a	MATCH(a) AGAINST('test1 test')
+test1	0.68526661396027
+EXECUTE stmt;
+a	MATCH(a) AGAINST('test1 test')
+test1	0.68526661396027
+DEALLOCATE PREPARE stmt;
+DROP TABLE t1;

--- 1.79/mysql-test/t/fulltext.test	2006-01-13 21:25:07 +04:00
+++ 1.81/mysql-test/t/fulltext.test	2006-02-07 15:17:05 +04:00
@@ -365,4 +365,16 @@
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
+#
+# BUG#14496: Crash or strange results with prepared statement,
+#            MATCH and FULLTEXT
+#
+CREATE TABLE t1 (a TEXT, FULLTEXT KEY(a));
+INSERT INTO t1 VALUES('test'),('test1'),('test');
+PREPARE stmt from "SELECT a, MATCH(a) AGAINST('test1 test') FROM t1 WHERE MATCH(a) AGAINST('test1 test')";
+EXECUTE stmt;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+DROP TABLE t1;
+
 # End of 4.1 tests