diff options
| author | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-06-20 14:13:13 +0500 |
|---|---|---|
| committer | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-06-20 14:13:13 +0500 |
| commit | 97b919485a3ea18f66f170d1276854a70143a830 (patch) | |
| tree | 83ee98db8e4f26429203a1b419a324a7c2e372c7 /sql | |
| parent | 78c4d8390ac6a65587c6d5ac2f415c5a32aa2ce1 (diff) | |
| parent | 83dfb9f88582d3501e5dbee0340051119c4193f5 (diff) | |
| download | mariadb-git-97b919485a3ea18f66f170d1276854a70143a830.tar.gz | |
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index c2ae300f021..78d03bbbd1a 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -883,6 +883,11 @@ create_table_option: table_list->next=0; lex->create_info.used_fields|= HA_CREATE_USED_UNION; } + | CHARSET EQ DEFAULT + { + Lex->create_info.table_charset=NULL; + Lex->create_info.used_fields|= HA_CREATE_USED_CHARSET; + } | CHARSET EQ ident { CHARSET_INFO *cs=get_charset_by_name($3.str,MYF(MY_WME)); |