database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

manual merge

Browse Source
This commit is contained in:
Tatjana Azundris Nuernberg
2011-08-08 17:45:43 +01:00
parent 5962cadcfa e6bc34e2c3
commit 0619bd5702
4 changed files with 87 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@ -2347,6 +2347,12 @@ case SQLCOM_PREPARE:
create_table->table_name))
goto end_with_restore_list;
#endif
/*
If no engine type was given, work out the default now
rather than at parse-time.
*/
if (!(create_info.used_fields & HA_CREATE_USED_ENGINE))
create_info.db_type= ha_default_handlerton(thd);
/*
If we are using SET CHARSET without DEFAULT, add an implicit
DEFAULT to not confuse old users. (This may change).