diff options
| author | serg@serg.mylan <> | 2003-06-16 00:13:25 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2003-06-16 00:13:25 +0200 |
| commit | 0d02b972db4e9949c46c7635d8b840c5479844a9 (patch) | |
| tree | 4374c7c6ea3b3f8fe9b746ededea18fa88af6fc6 | |
| parent | c1f1107b2ad02adf50671628681fb916ac4d98f3 (diff) | |
| parent | 7a08f3653b8402e7004f292ad0feb39c7870c9ef (diff) | |
| download | mariadb-git-0d02b972db4e9949c46c7635d8b840c5479844a9.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| -rw-r--r-- | mysql-test/r/fulltext.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/fulltext.test | 4 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index caf93e7e973..157beec2c01 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -172,9 +172,9 @@ CREATE TABLE t1 ( id int(11) auto_increment, title varchar(100) default '', PRIMARY KEY (id), -KEY ind5 (title), -FULLTEXT KEY FT1 (title) +KEY ind5 (title) ) TYPE=MyISAM; +CREATE FULLTEXT INDEX ft1 ON t1(title); insert into t1 (title) values ('this is a test'); select * from t1 where match title against ('test' in boolean mode); id title diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test index 40ac7f905c7..d06e2dce0a1 100644 --- a/mysql-test/t/fulltext.test +++ b/mysql-test/t/fulltext.test @@ -135,10 +135,10 @@ CREATE TABLE t1 ( id int(11) auto_increment, title varchar(100) default '', PRIMARY KEY (id), - KEY ind5 (title), - FULLTEXT KEY FT1 (title) + KEY ind5 (title) ) TYPE=MyISAM; +CREATE FULLTEXT INDEX ft1 ON t1(title); insert into t1 (title) values ('this is a test'); select * from t1 where match title against ('test' in boolean mode); update t1 set title='this is A test' where id=1; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index c385d6d5308..a109ca23891 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1498,7 +1498,9 @@ keys_or_index: opt_unique_or_fulltext: /* empty */ { $$= Key::MULTIPLE; } | UNIQUE_SYM { $$= Key::UNIQUE; } - | SPATIAL_SYM { $$= Key::SPATIAL; }; + | FULLTEXT_SYM { $$= Key::FULLTEXT;} + | SPATIAL_SYM { $$= Key::SPATIAL; } + ; key_alg: /* empty */ { $$= HA_KEY_ALG_UNDEF; } |