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

bad merge fixed

Browse Source 
mysql-test/r/fulltext.result:
  test for CREATE FULLTEXT INDEX
mysql-test/t/fulltext.test:
  test for CREATE FULLTEXT INDEX
This commit is contained in:
unknown
2003-06-16 00:13:23 +02:00
parent 7ababc3bb4
commit 7a938aea26
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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;

4
sql/sql_yacc.yy
View File

@ -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; }