Merge bk-internal.mysql.com:/home/bk/mysql-maria

into  mysql.com:/home/my/mysql-maria


storage/maria/ma_loghandler.c:
  Auto merged

3 files changed, 7 insertions, 2 deletions

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 2a5b2e92bb2..73731ead70b 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -1717,7 +1717,7 @@ t1	CREATE TABLE `t1` (
   `TIME` bigint(7) NOT NULL DEFAULT '0',
   `STATE` varchar(64) DEFAULT NULL,
   `INFO` longtext
-) ENGINE=MARIA DEFAULT CHARSET=utf8
+)  DEFAULT CHARSET=utf8
 drop table t1;
 create temporary table t1 like information_schema.processlist;
 show create table t1;
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index 60540e0066a..e491832ebac 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -1332,7 +1332,7 @@ drop function f1;
 # Bug#25629 CREATE TABLE LIKE does not work with INFORMATION_SCHEMA
 #
 create table t1 like information_schema.processlist;
---replace_result ENGINE=MyISAM "" ENGINE=Maria "" " PAGE_CHECKSUM=1" ""
+--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" ""
 show create table t1;
 drop table t1;
 create temporary table t1 like information_schema.processlist;
diff --git a/mysql-test/t/maria.test b/mysql-test/t/maria.test
index 9654b5c76ec..120f5178a4c 100644
--- a/mysql-test/t/maria.test
+++ b/mysql-test/t/maria.test
@@ -989,7 +989,9 @@ connect (session2,localhost,root,,);
 
 connection session1;
 disable_query_log;
+disable_warnings;
 eval create temporary table t1 (a int) data directory="$MYSQLTEST_VARDIR/tmp" select 9 a;
+enable_warnings;
 enable_query_log;
 disable_result_log;
 show create table t1;
@@ -997,7 +999,10 @@ enable_result_log;
 
 connection session2;
 disable_query_log;
+
+disable_warnings;
 eval create temporary table t1 (a int) data directory="$MYSQLTEST_VARDIR/tmp" select 99 a;
+enable_warnings;
 enable_query_log;
 disable_result_log;
 show create table t1;