diff options
| author | unknown <bar@mysql.com> | 2004-07-08 15:03:01 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2004-07-08 15:03:01 +0500 |
| commit | f96b20c95e2bf63911c4704abadf1ba0c82ae9ff (patch) | |
| tree | 2e028f911ac07fe3bc040168f6a7c961a2af7eb7 /sql/sql_yacc.yy | |
| parent | 002a555e5b8cc377ff575086178e608f94352415 (diff) | |
| download | mariadb-git-f96b20c95e2bf63911c4704abadf1ba0c82ae9ff.tar.gz | |
WL#807 Optimize loading database options in load_db_opt
also known as
BUG#2326 Charset of table is determined by charset of db only if "USE db;"
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 2860077b6a0..ccbaf7c0112 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1023,7 +1023,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.default_table_charset= thd->variables.collation_database; + lex->create_info.default_table_charset= NULL; lex->name=0; } create2 @@ -1815,7 +1815,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.default_table_charset= thd->variables.collation_database; + lex->create_info.default_table_charset= NULL; lex->create_info.row_type= ROW_TYPE_NOT_USED; lex->alter_info.reset(); lex->alter_info.is_simple= 1; |