diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-09-15 16:31:04 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-09-15 16:31:04 +0500 |
| commit | ebda1ae2820e0ca180e168fbc6edf739f4114943 (patch) | |
| tree | 0a3a1a25f4afbbef712e5f85b5de3d6ebbcebeb4 /sql/sql_yacc.yy | |
| parent | 0ea88acaa3f07a6612909c07abf59b585f1b0bc4 (diff) | |
| download | mariadb-git-ebda1ae2820e0ca180e168fbc6edf739f4114943.tar.gz | |
New SQL variables "collation_server" and "collation_database"
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 2a35c03f3b4..d9d79f03c3f 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -914,7 +914,7 @@ create: bzero((char*) &lex->create_info,sizeof(lex->create_info)); lex->create_info.options=$2 | $4; lex->create_info.db_type= (enum db_type) lex->thd->variables.table_type; - lex->create_info.table_charset= thd->variables.character_set_database; + lex->create_info.table_charset= thd->variables.collation_database; lex->name=0; } create2 @@ -1632,7 +1632,7 @@ alter: lex->select_lex.db=lex->name=0; bzero((char*) &lex->create_info,sizeof(lex->create_info)); lex->create_info.db_type= DB_TYPE_DEFAULT; - lex->create_info.table_charset= thd->variables.character_set_database; + lex->create_info.table_charset= thd->variables.collation_database; lex->create_info.row_type= ROW_TYPE_NOT_USED; lex->alter_keys_onoff=LEAVE_AS_IS; lex->simple_alter=1; @@ -4723,7 +4723,7 @@ option_value: THD *thd= YYTHD; LEX *lex= Lex; $2= $2 ? $2: global_system_variables.character_set_client; - lex->var_list.push_back(new set_var_collation_client($2,thd->variables.character_set_database,$2)); + lex->var_list.push_back(new set_var_collation_client($2,thd->variables.collation_database,$2)); } | NAMES_SYM charset_name_or_default opt_collate { |