Commit 0d02b972 authored by serg@serg.mylan's avatar serg@serg.mylan

Merge bk-internal:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents c1f1107b 7a08f365
...@@ -172,9 +172,9 @@ CREATE TABLE t1 ( ...@@ -172,9 +172,9 @@ CREATE TABLE t1 (
id int(11) auto_increment, id int(11) auto_increment,
title varchar(100) default '', title varchar(100) default '',
PRIMARY KEY (id), PRIMARY KEY (id),
KEY ind5 (title), KEY ind5 (title)
FULLTEXT KEY FT1 (title)
) TYPE=MyISAM; ) TYPE=MyISAM;
CREATE FULLTEXT INDEX ft1 ON t1(title);
insert into t1 (title) values ('this is a test'); insert into t1 (title) values ('this is a test');
select * from t1 where match title against ('test' in boolean mode); select * from t1 where match title against ('test' in boolean mode);
id title id title
......
...@@ -135,10 +135,10 @@ CREATE TABLE t1 ( ...@@ -135,10 +135,10 @@ CREATE TABLE t1 (
id int(11) auto_increment, id int(11) auto_increment,
title varchar(100) default '', title varchar(100) default '',
PRIMARY KEY (id), PRIMARY KEY (id),
KEY ind5 (title), KEY ind5 (title)
FULLTEXT KEY FT1 (title)
) TYPE=MyISAM; ) TYPE=MyISAM;
CREATE FULLTEXT INDEX ft1 ON t1(title);
insert into t1 (title) values ('this is a test'); insert into t1 (title) values ('this is a test');
select * from t1 where match title against ('test' in boolean mode); select * from t1 where match title against ('test' in boolean mode);
update t1 set title='this is A test' where id=1; update t1 set title='this is A test' where id=1;
......
...@@ -1498,7 +1498,9 @@ keys_or_index: ...@@ -1498,7 +1498,9 @@ keys_or_index:
opt_unique_or_fulltext: opt_unique_or_fulltext:
/* empty */ { $$= Key::MULTIPLE; } /* empty */ { $$= Key::MULTIPLE; }
| UNIQUE_SYM { $$= Key::UNIQUE; } | UNIQUE_SYM { $$= Key::UNIQUE; }
| SPATIAL_SYM { $$= Key::SPATIAL; }; | FULLTEXT_SYM { $$= Key::FULLTEXT;}
| SPATIAL_SYM { $$= Key::SPATIAL; }
;
key_alg: key_alg:
/* empty */ { $$= HA_KEY_ALG_UNDEF; } /* empty */ { $$= HA_KEY_ALG_UNDEF; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment