Another post-merge fix.

7bffc43f · pem@mysql.com · 78fba6ef · 7bffc43f
Commit 7bffc43f authored Nov 30, 2002 by pem@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/sql_yacc.yy sql/sql_yacc.yy +2 -1

No files found.
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1289,7 +1289,7 @@ opt_binary:
 	| BYTE_SYM			{ Lex->charset=my_charset_bin; }
 	| BINARY			{ Lex->charset=my_charset_bin; }
 	| CHAR_SYM SET charset_name	{ Lex->charset=$3; }
-
+	;

 opt_primary:
 	/* empty */
@@ -1723,6 +1723,7 @@ select_init:
 	    }
            /* select in braces, can't contain global parameters */
            sel->master_unit()->global_parameters=
+               sel->master_unit();
          } union_opt;

 select_init2: