summaryrefslogtreecommitdiff
path: root/mysql-test/r/index_intersect.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2015-08-11 18:45:38 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2015-08-11 18:45:38 +0200
commit76d6ac448d18a9e97ce4be585d79607780e00a49 (patch)
tree4a469019460057da12977d7ee6817f3873ac607d /mysql-test/r/index_intersect.result
parentba230c21adcfc6e6a6174ff25d8a8aebd1a70f0a (diff)
downloadmariadb-git-bb-10.1-MDEV-6066.tar.gz
MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be stopped with no-zero size)bb-10.1-MDEV-6066
Diffstat (limited to 'mysql-test/r/index_intersect.result')
-rw-r--r--mysql-test/r/index_intersect.result5
1 files changed, 1 insertions, 4 deletions
diff --git a/mysql-test/r/index_intersect.result b/mysql-test/r/index_intersect.result
index 1337c3fac2d..7a0633d4dc8 100644
--- a/mysql-test/r/index_intersect.result
+++ b/mysql-test/r/index_intersect.result
@@ -1013,10 +1013,7 @@ f4 varchar(32),
f5 int,
PRIMARY KEY (f1),
KEY (f4)
-) ENGINE=InnoDB;
-Warnings:
-Warning 1286 Unknown storage engine 'InnoDB'
-Warning 1266 Using storage engine MyISAM for table 't1'
+);
INSERT INTO t1 VALUES
(5,'H',1), (9,'g',0), (527,'i',0), (528,'y',1), (529,'S',6),
(530,'m',7), (531,'b',2), (532,'N',1), (533,'V',NULL), (534,'l',1),