database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
into  april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.1-new
This commit is contained in:
svoj@april.(none)
2006-01-16 21:42:09 +04:00
parent c435433c61 5581ef960a
commit 237e80670a
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/fulltext.result
View File

@ -437,3 +437,11 @@ SELECT a FROM t1 WHERE MATCH a AGAINST('testword\'\'' IN BOOLEAN MODE);
a a
testword'' testword''
DROP TABLE t1; 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;

8
mysql-test/t/fulltext.test
View File

@ -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); SELECT a FROM t1 WHERE MATCH a AGAINST('testword\'\'' IN BOOLEAN MODE);
DROP TABLE t1; 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 # End of 4.1 tests

2
sql/sql_table.cc
View File

@ -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); my_error(ER_WRONG_KEY_COLUMN, MYF(0), column->field_name);
DBUG_RETURN(-1); 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(); length=file->max_key_part_length();
if (key->type == Key::MULTIPLE) if (key->type == Key::MULTIPLE)