Merge

sql/sql_yacc.yy:
  Auto merged
sql/sql_parse.cc:
  merged

sql/item_func.h

@@ -829,7 +829,7 @@ class Item_func_inet_aton : public Item_int_func
 };
 
 
-/* SerG: for fulltext search */
+/* for fulltext search */
 #include <ft_global.h>
 
 class Item_func_match :public Item_real_func
@@ -855,4 +855,3 @@ class Item_func_match :public Item_real_func
   double val();
   longlong val_int() { return val()!=0.0; }
 };
-

sql/sql_parse.cc

@@ -1137,7 +1137,7 @@ mysql_execute_command(void)
     if (mysql_rename_tables(thd,tables))
       res= -1;
     break;
-  case SQLCOM_SHOW_CREATE:
+  case SQLCOM_SHOW_CREATE: /* SerG:show */
 #ifdef DONT_ALLOW_SHOW_COMMANDS
     send_error(&thd->net,ER_NOT_ALLOWED_COMMAND);	/* purecov: inspected */
     DBUG_VOID_RETURN;
@@ -1385,7 +1385,7 @@ mysql_execute_command(void)
       break;
     }
 #endif
-  case SQLCOM_SHOW_FIELDS:
+  case SQLCOM_SHOW_FIELDS: /* SerG:show */
 #ifdef DONT_ALLOW_SHOW_COMMANDS
     send_error(&thd->net,ER_NOT_ALLOWED_COMMAND);	/* purecov: inspected */
     DBUG_VOID_RETURN;
@@ -1411,7 +1411,7 @@ mysql_execute_command(void)
       break;
     }
 #endif
-  case SQLCOM_SHOW_KEYS:
+  case SQLCOM_SHOW_KEYS: /* SerG:show */
 #ifdef DONT_ALLOW_SHOW_COMMANDS
     send_error(&thd->net,ER_NOT_ALLOWED_COMMAND);	/* purecov: inspected */
     DBUG_VOID_RETURN;

sql/sql_yacc.yy

@@ -964,6 +964,7 @@ delete_option:
 key_type:
 	opt_constraint PRIMARY_SYM KEY_SYM  { $$= Key::PRIMARY; }
 	| key_or_index			    { $$= Key::MULTIPLE; }
+	| COLLECTION			    { $$= Key::FULLTEXT; }
 	| opt_constraint UNIQUE_SYM	    { $$= Key::UNIQUE; }
 	| opt_constraint UNIQUE_SYM key_or_index { $$= Key::UNIQUE; }