Commit 0d0d68ab authored by unknown's avatar unknown
Browse files

Merge april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.0 

into  april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.1-new


sql/sql_table.cc:
  Auto merged
parents 167e017c 7f397ffd

mysql-test/r/fulltext.result

+8 −0
Original line number Diff line number Diff line
@@ -437,3 +437,11 @@ SELECT a FROM t1 WHERE MATCH a AGAINST('testword\'\'' IN BOOLEAN MODE); 
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;

mysql-test/t/fulltext.test

+8 −0
Original line number Diff line number Diff line
@@ -357,4 +357,12 @@ SELECT a FROM t1 WHERE MATCH a AGAINST('testword' IN BOOLEAN MODE); 
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

sql/sql_table.cc

+1 −1
Original line number Diff line number Diff line
@@ -1523,7 +1523,7 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info, 
	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)