From cfbd9270243e4b429cdc26e8554bcc99690f2422 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Sep 2010 16:43:41 +0300 Subject: [PATCH] Engine should not be mentioned in such test --- mysql-test/r/subselect_cache.result | 4 ++-- mysql-test/t/subselect_cache.test | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/subselect_cache.result b/mysql-test/r/subselect_cache.result index 374bb44e5c5..7d9e2bb7150 100644 --- a/mysql-test/r/subselect_cache.result +++ b/mysql-test/r/subselect_cache.result @@ -3209,7 +3209,7 @@ CREATE TABLE `t1` ( PRIMARY KEY (`pk`), KEY `col_int_key` (`col_int_key`), KEY `col_varchar_key` (`col_varchar_key`,`col_int_key`) -) ENGINE=MARIA AUTO_INCREMENT=30 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1; +) AUTO_INCREMENT=30 DEFAULT CHARSET=latin1; INSERT INTO `t1` VALUES (10,7,8,'v','v'); INSERT INTO `t1` VALUES (11,1,9,'r','r'); INSERT INTO `t1` VALUES (12,5,9,'a','a'); @@ -3239,7 +3239,7 @@ CREATE TABLE `t2` ( PRIMARY KEY (`pk`), KEY `col_int_key` (`col_int_key`), KEY `col_varchar_key` (`col_varchar_key`,`col_int_key`) -) ENGINE=MARIA AUTO_INCREMENT=21 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1; +) AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; INSERT INTO `t2` VALUES (1,NULL,2,'w','w'); INSERT INTO `t2` VALUES (2,7,9,'m','m'); INSERT INTO `t2` VALUES (3,9,3,'m','m'); diff --git a/mysql-test/t/subselect_cache.test b/mysql-test/t/subselect_cache.test index 32099c51003..9045c7f0e14 100644 --- a/mysql-test/t/subselect_cache.test +++ b/mysql-test/t/subselect_cache.test @@ -1500,7 +1500,7 @@ CREATE TABLE `t1` ( PRIMARY KEY (`pk`), KEY `col_int_key` (`col_int_key`), KEY `col_varchar_key` (`col_varchar_key`,`col_int_key`) -) ENGINE=MARIA AUTO_INCREMENT=30 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1; +) AUTO_INCREMENT=30 DEFAULT CHARSET=latin1; INSERT INTO `t1` VALUES (10,7,8,'v','v'); INSERT INTO `t1` VALUES (11,1,9,'r','r'); INSERT INTO `t1` VALUES (12,5,9,'a','a'); @@ -1530,7 +1530,7 @@ CREATE TABLE `t2` ( PRIMARY KEY (`pk`), KEY `col_int_key` (`col_int_key`), KEY `col_varchar_key` (`col_varchar_key`,`col_int_key`) -) ENGINE=MARIA AUTO_INCREMENT=21 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1; +) AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; INSERT INTO `t2` VALUES (1,NULL,2,'w','w'); INSERT INTO `t2` VALUES (2,7,9,'m','m'); INSERT INTO `t2` VALUES (3,9,3,'m','m');