1 files changed, 40 insertions, 30 deletions

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 5aeb14535e3..69d2aa9f470 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -341,12 +341,12 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
 */
 
 /* Start SQL_MODE_DEFAULT_SPECIFIC */
-%expect 46
+%expect 67
 /* End SQL_MODE_DEFAULT_SPECIFIC */
 
 
 /* Start SQL_MODE_ORACLE_SPECIFIC
-%expect 49
+%expect 69
 End SQL_MODE_ORACLE_SPECIFIC */
 
 
@@ -1356,7 +1356,7 @@ End SQL_MODE_ORACLE_SPECIFIC */
 
 %type <sp_handler> sp_handler
 
-%type <Lex_field_type> type_with_opt_collate field_type
+%type <Lex_field_type> field_type field_type_all
         qualified_field_type
         field_type_numeric
         field_type_string
@@ -3002,7 +3002,7 @@ sp_param_name:
         ;
 
 sp_param_name_and_type:
-          sp_param_name type_with_opt_collate
+          sp_param_name field_type
           {
             if (unlikely(Lex->sp_param_fill_definition($$= $1, $2)))
               MYSQL_YYABORT;
@@ -3082,7 +3082,7 @@ optionally_qualified_column_ident:
 
 
 row_field_definition:
-          row_field_name type_with_opt_collate
+          row_field_name field_type
           {
             Lex->last_field->set_attributes(thd, $2, Lex->charset,
                                             COLUMN_DEFINITION_ROUTINE_LOCAL);
@@ -3115,7 +3115,7 @@ sp_decl_idents_init_vars:
 
 sp_decl_variable_list:
           sp_decl_idents_init_vars
-          type_with_opt_collate
+          field_type
           {
             Lex->last_field->set_attributes(thd, $2, Lex->charset,
                                             COLUMN_DEFINITION_ROUTINE_LOCAL);
@@ -6188,19 +6188,25 @@ column_default_expr:
           }
         ;
 
+field_type: field_type_all
+        {
+          Lex->map_data_type(Lex_ident_sys(), &($$= $1));
+        }
+        ;
+
 qualified_field_type:
-          field_type
+          field_type_all
           {
             Lex->map_data_type(Lex_ident_sys(), &($$= $1));
           }
-        | sp_decl_ident '.' field_type
+        | sp_decl_ident '.' field_type_all
           {
             if (Lex->map_data_type($1, &($$= $3)))
               MYSQL_YYABORT;
           }
         ;
 
-field_type:
+field_type_all:
           field_type_numeric
         | field_type_temporal
         | field_type_string
@@ -6663,19 +6669,6 @@ with_or_without_system:
         ;
 
 
-type_with_opt_collate:
-        field_type opt_collate
-        {
-          Lex->map_data_type(Lex_ident_sys(), &($$= $1));
-
-          if ($2)
-          {
-            if (unlikely(!(Lex->charset= merge_charset_and_collation(Lex->charset, $2))))
-              MYSQL_YYABORT;
-          }
-        }
-        ;
-
 charset:
           CHAR_SYM SET { $$= $1; }
         | CHARSET { $$= $1; }
@@ -6749,6 +6742,12 @@ charset_or_alias:
           }
         ;
 
+collate: COLLATE_SYM collation_name_or_default
+         {
+           Lex->charset= $2;
+         }
+       ;
+
 opt_binary:
           /* empty */             { bincmp_collation(NULL, false); }
         | binary {}
@@ -6759,6 +6758,13 @@ binary:
         | charset_or_alias opt_bin_mod { bincmp_collation($1, $2); }
         | BINARY                  { bincmp_collation(NULL, true); }
         | BINARY charset_or_alias { bincmp_collation($2, true); }
+        | charset_or_alias collate
+          {
+            if (!my_charset_same(Lex->charset, $1))
+              my_yyabort_error((ER_COLLATION_CHARSET_MISMATCH, MYF(0),
+                                Lex->charset->name, $1->csname));
+          }
+        | collate { }
         ;
 
 opt_bin_mod:
@@ -14323,7 +14329,7 @@ kill:
             lex->sql_command= SQLCOM_KILL;
             lex->kill_type= KILL_TYPE_ID;
           }
-          kill_type kill_option kill_expr
+          kill_type kill_option
           {
             Lex->kill_signal= (killed_state) ($3 | $4);
           }
@@ -14336,16 +14342,21 @@ kill_type:
         ;
 
 kill_option:
-          /* empty */    { $$= (int) KILL_CONNECTION; }
-        | CONNECTION_SYM { $$= (int) KILL_CONNECTION; }
-        | QUERY_SYM      { $$= (int) KILL_QUERY; }
-        | QUERY_SYM ID_SYM
+          opt_connection kill_expr { $$= (int) KILL_CONNECTION; }
+        | QUERY_SYM      kill_expr { $$= (int) KILL_QUERY; }
+        | QUERY_SYM ID_SYM expr
           {
             $$= (int) KILL_QUERY;
             Lex->kill_type= KILL_TYPE_QUERY;
+            Lex->value_list.push_front($3, thd->mem_root);
           }
         ;
 
+opt_connection:
+          /* empty */    { }
+        | CONNECTION_SYM { }
+        ;
+
 kill_expr:
         expr
         {
@@ -14358,7 +14369,6 @@ kill_expr:
           }
         ;
 
-
 shutdown:
         SHUTDOWN { Lex->sql_command= SQLCOM_SHUTDOWN; }
         shutdown_option {}
@@ -17646,7 +17656,7 @@ sf_return_type:
                                  &empty_clex_str,
                                  thd->variables.collation_database);
           }
-          type_with_opt_collate
+          field_type
           {
             if (unlikely(Lex->sf_return_fill_definition($2)))
               MYSQL_YYABORT;
@@ -18339,7 +18349,7 @@ sp_opt_inout:
         ;
 
 sp_pdparam:
-          sp_param_name sp_opt_inout type_with_opt_collate
+          sp_param_name sp_opt_inout field_type
           {
             $1->mode= $2;
             if (unlikely(Lex->sp_param_fill_definition($1, $3)))