diff options
| author | Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> | 2011-08-08 17:45:43 +0100 |
|---|---|---|
| committer | Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> | 2011-08-08 17:45:43 +0100 |
| commit | be6f501f478daff15ef61c0cbb3ebc6c65b30bf2 (patch) | |
| tree | cc3e4367c702b80f1519e45cda93846dc00c8c2b /sql/sql_yacc.yy | |
| parent | 337d7935d988fe7ad0336d9dcb7ce9e8eea01af6 (diff) | |
| parent | 4a0516a70a44c6df83991bd97491e9c7e81dc369 (diff) | |
| download | mariadb-git-be6f501f478daff15ef61c0cbb3ebc6c65b30bf2.tar.gz | |
manual merge
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 ba1b9e43713..ff2f2a8f273 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2038,7 +2038,6 @@ create: lex->change=NullS; bzero((char*) &lex->create_info,sizeof(lex->create_info)); lex->create_info.options=$2 | $4; - lex->create_info.db_type= ha_default_handlerton(thd); lex->create_info.default_table_charset= NULL; lex->name.str= 0; lex->name.length= 0; @@ -2048,7 +2047,8 @@ create: { LEX *lex= YYTHD->lex; lex->current_select= &lex->select_lex; - if (!lex->create_info.db_type) + if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) && + !lex->create_info.db_type) { lex->create_info.db_type= ha_default_handlerton(YYTHD); push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, |