bad merge fixed

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

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;

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