1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Charset related synax changes, now these things work in parser:

Browse Source 
CREATE DATABASE name DEFAULT CHARACTER SET charsetname;
CREATE DATABASE name (fieldname CHAR(n) CHARACTER SET charsetname);
Changes affect query parsing ONLY and do not have other effect yet.
 


sql/sql_lex.h:
  Charset related synax changes
sql/sql_yacc.yy:
  Charset related synax changes
This commit is contained in:
unknown 2002-05-20 17:10:50 +05:00
parent 8bee96ab0a
commit 3f50440f30
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_lex.h
View File

@ -189,6 +189,7 @@ typedef struct st_lex {
bool drop_primary,drop_if_exists,local_file; bool drop_primary,drop_if_exists,local_file;
bool in_comment,ignore_space,verbose,simple_alter, option_type, derived_tables; bool in_comment,ignore_space,verbose,simple_alter, option_type, derived_tables;
uint slave_thd_opt; uint slave_thd_opt;
CHARSET_INFO *charset;
} LEX; } LEX;

29
sql/sql_yacc.yy
View File

@ -777,7 +777,7 @@ create:
lex->key_list.push_back(new Key($2,$5,$4.str,lex->col_list)); lex->key_list.push_back(new Key($2,$5,$4.str,lex->col_list));
lex->col_list.empty(); lex->col_list.empty();
} }
| CREATE DATABASE opt_if_not_exists ident | CREATE DATABASE opt_if_not_exists ident default_charset
{ {
LEX *lex=Lex; LEX *lex=Lex;
lex->sql_command=SQLCOM_CREATE_DB; lex->sql_command=SQLCOM_CREATE_DB;
@ -1095,8 +1095,31 @@ attribute:
| UNIQUE_SYM KEY_SYM { Lex->type|= UNIQUE_KEY_FLAG; } | UNIQUE_SYM KEY_SYM { Lex->type|= UNIQUE_KEY_FLAG; }
opt_binary: opt_binary:
/* empty */ {} /* empty */ { Lex->charset=default_charset_info; }
| BINARY { Lex->type|=BINARY_FLAG; } | BINARY { Lex->type|=BINARY_FLAG; Lex->charset=default_charset_info; }
| CHAR_SYM SET ident
{
CHARSET_INFO *cs=get_charset_by_name($3.str,MYF(MY_WME));
if (!cs)
{
net_printf(&current_thd->net,ER_UNKNOWN_CHARACTER_SET,$3);
YYABORT;
}
Lex->charset=cs;
}
default_charset:
/* empty */ { Lex->charset-default_charset_info; }
| DEFAULT CHAR_SYM SET ident
{
CHARSET_INFO *cs=get_charset_by_name($4.str,MYF(MY_WME));
if (!cs)
{
net_printf(&current_thd->net,ER_UNKNOWN_CHARACTER_SET,$4);
YYABORT;
}
Lex->charset=cs;
}
references: references:
REFERENCES table_ident opt_on_delete {} REFERENCES table_ident opt_on_delete {}