Automatic merge

mysql-test/r/myisam.result

@@ -454,7 +454,7 @@ a	b	c
 drop table t1;
 DROP TABLE IF EXISTS t1;
 Warnings:
-Note	1051	Unknown table 't1'
+Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (a varchar(150) NOT NULL, KEY (a));
 INSERT t1 VALUES ("can \tcan");
 INSERT t1 VALUES ("can   can");
@@ -618,7 +618,7 @@ t1	1	a	1	a	A	1000	NULL	NULL	YES	BTREE
 alter table t1 engine=heap;
 alter table t1 disable keys;
 Warnings:
-Note	1031	Table storage engine for 't1' doesn't have this option
+Note	1031	Storage engine MEMORY of the table `test`.`t1` doesn't have this option
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 t1	1	a	1	a	NULL	500	NULL	NULL	YES	HASH		

sql/sql_table.cc

@@ -4504,6 +4504,18 @@ bool create_table_impl(THD *thd,
     goto err;
   }
 
+  /* Give warnings for not supported table options */
+#if defined(WITH_ARIA_STORAGE_ENGINE)
+  extern handlerton *maria_hton;
+  if (file->ht != maria_hton)
+#endif
+    if (create_info->transactional)
+      push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+                          ER_ILLEGAL_HA_CREATE_OPTION,
+                          ER(ER_ILLEGAL_HA_CREATE_OPTION),
+                          file->engine_name()->str,
+                          "TRANSACTIONAL=1");
+
   if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))
   {
     char frm_name[FN_REFLEN+1];