diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-07-01 15:57:45 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-07-01 15:57:45 +0300 |
| commit | c672b5d04b4828a194df6e1a99c8454b07dc2400 (patch) | |
| tree | eeea6a24bfdcb6f6e2e163c4da948e52544e90de /sql/sql_yacc.yy | |
| parent | da25c0337a596c8300af69b2f4e53c3cee526bc5 (diff) | |
| parent | 14c8a0e536b6326a4ba759ba30377e8a9654b513 (diff) | |
| download | mariadb-git-c672b5d04b4828a194df6e1a99c8454b07dc2400.tar.gz | |
merge
acinclude.m4:
Auto merged
mysql-test/r/subselect.result:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 1d605abe8a3..6072be28dca 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1597,6 +1597,7 @@ alter_list_item: LEX *lex=Lex; lex->length=lex->dec=0; lex->type=0; lex->interval=0; lex->default_value=lex->comment=0; + lex->charset= NULL; lex->simple_alter=0; } type opt_attribute |