bk commit into 5.0 tree (svoj:1.2015) BUG#13835

[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.2015 06/01/13 21:25:12 svoj@april.(none) +3 -0
  BUG#13835: max key length is 1000 bytes when trying to create a fulltext index
  Allow fulltext index on VARCHAR columns longer than max key length.

  sql/sql_table.cc
    1.292 06/01/13 21:25:07 svoj@april.(none) +1 -1
    Allow fulltext index on VARCHAR columns longer than max key length.

  mysql-test/t/fulltext.test
    1.79 06/01/13 21:25:07 svoj@april.(none) +8 -0
    A test case for BUG#13835 added.

  mysql-test/r/fulltext.result
    1.83 06/01/13 21:25:07 svoj@april.(none) +8 -0
    A test case for BUG#13835 added.

# 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/BUG13835/mysql-5.0

--- 1.291/sql/sql_table.cc	2005-12-05 15:08:19 +04:00
+++ 1.292/sql/sql_table.cc	2006-01-13 21:25:07 +04:00
@@ -1296,7 +1296,7 @@
 	my_error(ER_WRONG_KEY_COLUMN, MYF(0), column->field_name);
 	  DBUG_RETURN(-1);
       }
-      if (length > file->max_key_part_length())
+      if (length > file->max_key_part_length() && key->type != Key::FULLTEXT)
       {
 	length=file->max_key_part_length();
 	if (key->type == Key::MULTIPLE)

--- 1.82/mysql-test/r/fulltext.result	2005-11-26 23:22:50 +04:00
+++ 1.83/mysql-test/r/fulltext.result	2006-01-13 21:25:07 +04:00
@@ -437,3 +437,11 @@
 a
 testword''
 DROP TABLE t1;
+CREATE TABLE t1 (a VARCHAR(10000), FULLTEXT(a));
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` varchar(10000) default NULL,
+  FULLTEXT KEY `a` (`a`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;

--- 1.78/mysql-test/t/fulltext.test	2005-11-26 23:22:50 +04:00
+++ 1.79/mysql-test/t/fulltext.test	2006-01-13 21:25:07 +04:00
@@ -357,4 +357,12 @@
 SELECT a FROM t1 WHERE MATCH a AGAINST('testword\'\'' IN BOOLEAN MODE);
 DROP TABLE t1;
 
+#
+# BUG#13835: max key length is 1000 bytes when trying to create
+#            a fulltext index
+#
+CREATE TABLE t1 (a VARCHAR(10000), FULLTEXT(a));
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
 # End of 4.1 tests