diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-03 22:28:16 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-03 22:28:16 +0200 |
| commit | 29bae7b7b7c2aec02fe5789f3fc6a0fb918c0814 (patch) | |
| tree | 0a2390d862862624034715894ef105522aed276b /sql/sql_yacc.yy | |
| parent | 36a4cc178fc574dd9996c620eca609fe456d8c58 (diff) | |
| parent | 8b91ed2c39add003ebc56d520c902fd092f1f741 (diff) | |
| download | mariadb-git-29bae7b7b7c2aec02fe5789f3fc6a0fb918c0814.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
acinclude.m4:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
Docs/manual.texi:
Bad merge.
include/mysqld_error.h:
Merge with 3.23
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 3d0a183d9a2..2c08fc3cb86 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1138,7 +1138,7 @@ alter_list_item: LEX *lex=Lex; lex->change= $3.str; lex->simple_alter=0; } - field_spec + field_spec opt_place | MODIFY_SYM opt_column field_ident { LEX *lex=Lex; @@ -1157,6 +1157,7 @@ alter_list_item: YYABORT; lex->simple_alter=0; } + opt_place | DROP opt_column field_ident opt_restrict { LEX *lex=Lex; |