summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorAnel Husakovic <anelhusakovic88@gmail.com>2018-05-15 11:17:43 +0000
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2018-07-09 11:19:55 +0300
commit9d2420b9fbfbdb87ec123869b57e06ff64dca298 (patch)
tree4617b20b7e9edd17c3f6f5f33fa590ddaa43e489 /sql/sql_table.cc
parent1cc1d0429da14a041a6240c6fce17e0d31cad8e2 (diff)
downloadmariadb-git-bb-pr-774.tar.gz
MDEV-12914: Disable silently call of myisambb-pr-774
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 73f62f2f2c8..49094da2709 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -10461,14 +10461,10 @@ bool check_engine(THD *thd, const char *db_name,
if (create_info->tmp_table() &&
ha_check_storage_engine_flag(*new_engine, HTON_TEMPORARY_NOT_SUPPORTED))
{
- if (create_info->used_fields & HA_CREATE_USED_ENGINE)
- {
- my_error(ER_ILLEGAL_HA_CREATE_OPTION, MYF(0),
- hton_name(*new_engine)->str, "TEMPORARY");
- *new_engine= 0;
- DBUG_RETURN(true);
- }
- *new_engine= myisam_hton;
+ my_error(ER_ILLEGAL_HA_CREATE_OPTION, MYF(0),
+ hton_name(*new_engine)->str, "TEMPORARY");
+ *new_engine= 0;
+ DBUG_RETURN(true);
}
DBUG_RETURN(false);