bk commit into 5.0 tree (svoj:1.1911)

[svoj]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1911 05/09/23 14:55:17 svoj@stripped +1 -0
  WL#2575 - Fulltext: Parser plugin for FTS
  Added WITH PARSER syntax to CREATE INDEX statement.

  sql/sql_yacc.yy
    1.415 05/09/23 14:55:13 svoj@stripped +7 -3
    Added WITH PARSER syntax to CREATE INDEX statement.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	svoj-laptop.mysql.com
# Root:	/home/svoj/devel/mysql/CNET/ci-mysql-5.0

--- 1.414/sql/sql_yacc.yy	2005-09-02 02:59:48 +05:00
+++ 1.415/sql/sql_yacc.yy	2005-09-23 14:55:13 +05:00
@@ -1173,11 +1173,15 @@
 	    lex->col_list.empty();
 	    lex->change=NullS;
 	  }
-	   '(' key_list ')'
+	   '(' key_list ')' opt_fulltext_parser
 	  {
 	    LEX *lex=Lex;
-
-	    lex->key_list.push_back(new Key($2,$4.str, $5, 0, lex->col_list));
+	    if ($2 != Key::FULLTEXT && $12)
+	    {
+	      yyerror(ER(ER_SYNTAX_ERROR));
+	      YYABORT;
+	    }
+	    lex->key_list.push_back(new Key($2,$4.str,$5,0,lex->col_list,$12));
 	    lex->col_list.empty();
 	  }
 	| CREATE DATABASE opt_if_not_exists ident