diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-10-12 14:34:44 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-10-12 14:34:44 +0300 |
| commit | 492e5b9bcea61759ea7a134b758db131a7083ef9 (patch) | |
| tree | 3a78110500a95c0e6c6410e6a7b730d882f168e5 /sql/sql_parse.cc | |
| parent | 2a8a76537ff7486286b463084da2f6d9ac905d40 (diff) | |
| parent | c6120de68f6d0d6a79ffeb5fef6efa394dc5184c (diff) | |
| download | mariadb-git-492e5b9bcea61759ea7a134b758db131a7083ef9.tar.gz | |
auto-merge mysql-5.1->mysql-5.1-security
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 55509a31f77..a88cc2fa8e5 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2642,6 +2642,12 @@ mysql_execute_command(THD *thd) 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). */ |