diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-01-08 16:29:31 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-01-08 16:29:31 +0400 |
| commit | 3bc97a7f660a464625d3605d58bfca45c05b338b (patch) | |
| tree | 567bb3bc22e8a6c2f3d7a1064088d67a239a427b | |
| parent | 1c334ec0c588da5f93dff2e75f7c64c22c204c60 (diff) | |
| download | mariadb-git-3bc97a7f660a464625d3605d58bfca45c05b338b.tar.gz | |
Renamed to look in common style
| -rw-r--r-- | sql/sql_yacc.yy | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 587538fe0e2..6e32805310f 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -633,7 +633,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %type <charset> charset_name charset_name_or_default - opt_db_default_character_set + opt_default_charset %type <variable> internal_variable_name @@ -857,7 +857,7 @@ create: lex->key_list.push_back(new Key($2,$4.str, $5, lex->col_list)); lex->col_list.empty(); } - | CREATE DATABASE opt_if_not_exists ident opt_db_default_character_set + | CREATE DATABASE opt_if_not_exists ident opt_default_charset { LEX *lex=Lex; lex->sql_command=SQLCOM_CREATE_DB; @@ -1236,15 +1236,7 @@ attribute: charset_name: - BINARY - { - if (!($$=get_charset_by_name("binary",MYF(0)))) - { - net_printf(YYTHD,ER_UNKNOWN_CHARACTER_SET,"binary"); - YYABORT; - } - } - | ident + ident { if (!($$=get_charset_by_name($1.str,MYF(0)))) { @@ -1261,7 +1253,7 @@ opt_default: /* empty */ {} | DEFAULT {}; -opt_db_default_character_set: +opt_default_charset: /* empty */ { $$=default_charset_info; } | opt_default CHAR_SYM SET charset_name_or_default { $$=$4; } | opt_default CHARSET charset_name_or_default { $$=$3; }; @@ -1408,7 +1400,7 @@ alter: } alter_list {} - | ALTER DATABASE ident opt_db_default_character_set + | ALTER DATABASE ident opt_default_charset { LEX *lex=Lex; lex->sql_command=SQLCOM_ALTER_DB; |