Skip to content

Commit 2642a88

Browse files
author
Sneha Modi
committed
WL#7411 : Migrate tests that do not show any result difference when run with innodb engine
1 parent abba63f commit 2642a88

File tree

259 files changed

+191
-1048
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

259 files changed

+191
-1048
lines changed

‎mysql-test/r/alias.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ KEY prov_hdl_nr(prov_hdl_nr),
4747
KEY mcbs_aufnr(mcbs_aufnr),
4848
KEY kundentyp(kundentyp),
4949
KEY p_nr(p_nr,suffix)
50-
) ENGINE=MyISAM;
50+
);
5151
INSERT INTO t1 VALUES (3359356,405,3359356,'Mustermann Musterfrau',52500,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und gepr�ft','','privat',1485525,2122316,'+','','N',1909160,'MobilComSuper92000D2',NULL,NULL,'MS9ND2',3,24,'MobilCom Shop Koeln',52500,NULL,'auto',20010202105916,'Mobilfunk','PP','','','');
5252
INSERT INTO t1 VALUES (3359357,468,3359357,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und gepr�ft','','privat',1503580,2139699,'+','','P',1909171,'MobilComSuper9D1T10SFreisprech(Akquise)',NULL,NULL,'MS9NS1',327,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','','');
5353
INSERT INTO t1 VALUES (3359358,407,3359358,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und gepr�ft','','privat',1501358,2137473,'N','','N',1909159,'MobilComSuper92000D2',NULL,NULL,'MS9ND2',325,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','','');

‎mysql-test/r/analyze.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ check table t1;
3030
Table Op Msg_type Msg_text
3131
test.t1 check status OK
3232
drop table t1;
33-
create table t1 (a mediumtext, fulltext key key1(a)) charset utf8 collate utf8_general_ci engine myisam;
33+
create table t1 (a mediumtext, fulltext key key1(a)) charset utf8 collate utf8_general_ci;
3434
insert into t1 values ('hello');
3535
analyze table t1;
3636
Table Op Msg_type Msg_text
3737
test.t1 analyze status OK
3838
analyze table t1;
3939
Table Op Msg_type Msg_text
40-
test.t1 analyze status Table is already up to date
40+
test.t1 analyze status OK
4141
drop table t1;
4242
CREATE TABLE t1 (a int);
4343
prepare stmt1 from "SELECT * FROM t1 PROCEDURE ANALYSE()";

‎mysql-test/r/compare.result

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
drop table if exists t1;
22
CREATE TABLE t1 (id CHAR(12) not null, PRIMARY KEY (id));
33
insert into t1 values ('000000000001'),('000000000002');
4+
analyze table t1;
5+
Table Op Msg_type Msg_text
6+
test.t1 analyze status OK
47
explain select * from t1 where id=000000000001;
58
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
69
1 SIMPLE t1 NULL index PRIMARY PRIMARY 12 NULL 2 100.00 Using where; Using index
@@ -64,9 +67,12 @@ CONCAT(b,c) CONCAT(b,c) = '0101'
6467
0102 0
6568
0101 1
6669
0202 0
70+
analyze table t1;
71+
Table Op Msg_type Msg_text
72+
test.t1 analyze status OK
6773
EXPLAIN EXTENDED SELECT b,c FROM t1 WHERE b = 1 AND CONCAT(b,c) = '0101';
6874
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
69-
1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 3 100.00 Using where
75+
1 SIMPLE t1 NULL ALL NULL NULL NULL NULL x 100.00 Using where
7076
Warnings:
7177
Warning 1681 'EXTENDED' is deprecated and will be removed in a future release.
7278
Note 1003 /* select#1 */ select `test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where ((`test`.`t1`.`b` = 1) and (concat('01',`test`.`t1`.`c`) = '0101'))
@@ -82,14 +88,20 @@ FROM t2 ORDER BY a;
8288
a x
8389
1 1
8490
2 0
91+
analyze table t1;
92+
Table Op Msg_type Msg_text
93+
test.t1 analyze status OK
94+
analyze table t2;
95+
Table Op Msg_type Msg_text
96+
test.t2 analyze status OK
8597
EXPLAIN EXTENDED
8698
SELECT a,
8799
(SELECT COUNT(*) FROM t1
88100
WHERE b = t2.a AND CONCAT(b,c) = CONCAT('0',t2.a,'01')) x
89101
FROM t2 ORDER BY a;
90102
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
91-
1 PRIMARY t2 NULL ALL NULL NULL NULL NULL 2 100.00 Using filesort
92-
2 DEPENDENT SUBQUERY t1 NULL ALL NULL NULL NULL NULL 3 100.00 Using where
103+
1 PRIMARY t2 NULL ALL NULL NULL NULL NULL x 100.00 Using filesort
104+
2 DEPENDENT SUBQUERY t1 NULL ALL NULL NULL NULL NULL x 100.00 Using where
93105
Warnings:
94106
Warning 1681 'EXTENDED' is deprecated and will be removed in a future release.
95107
Note 1276 Field or reference 'test.t2.a' of SELECT #2 was resolved in SELECT #1

‎mysql-test/r/ctype_gbk_binlog.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ RESET MASTER;
22
SET NAMES gbk;
33
CREATE TABLE t1 (
44
f1 BLOB
5-
) ENGINE=MyISAM DEFAULT CHARSET=gbk;
5+
) DEFAULT CHARSET=gbk;
66
CREATE PROCEDURE p1(IN val BLOB)
77
BEGIN
88
SET @tval = val;

‎mysql-test/r/default.result

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ y varchar(5) binary NOT NULL DEFAULT ' ',
6363
z varchar(20) binary NOT NULL DEFAULT ' ',
6464
a1 varchar(30) binary NOT NULL DEFAULT ' ',
6565
b1 tinyblob NULL)
66-
ENGINE=MyISAM DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;
66+
DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;
6767
SHOW CREATE TABLE t2;
6868
Table Create Table
6969
t2 CREATE TABLE `t2` (
@@ -95,7 +95,7 @@ t2 CREATE TABLE `t2` (
9595
`z` varchar(20) COLLATE latin1_bin NOT NULL DEFAULT ' ',
9696
`a1` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
9797
`b1` tinyblob
98-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin
98+
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin
9999
INSERT into t2 (b) values ('1');
100100
SHOW WARNINGS;
101101
Level Code Message

‎mysql-test/r/execution_constants.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CREATE TABLE `t_bug21476` (
55
`ID_MSG` mediumint(8) unsigned NOT NULL default '0',
66
PRIMARY KEY (`ID_MEMBER`,`ID_BOARD`),
77
KEY `logTime` (`logTime`)
8-
) ENGINE=MyISAM DEFAULT CHARSET=cp1251 COLLATE=cp1251_bulgarian_ci;
8+
) DEFAULT CHARSET=cp1251 COLLATE=cp1251_bulgarian_ci;
99
INSERT INTO `t_bug21476` VALUES (2,2,1154870939,0),(1,2,1154870957,0),(2,183,1154941362,0),(2,84,1154904301,0),(1,84,1154905867,0),(2,13,1154947484,10271),(3,84,1154880549,0),(1,6,1154892183,0),(2,25,1154947581,10271),(3,25,1154904760,0),(1,25,1154947373,10271),(1,179,1154899992,0),(2,179,1154899410,0),(5,25,1154901666,0),(2,329,1154902026,0),(3,329,1154902040,0),(1,329,1154902058,0),(1,13,1154930841,0),(3,85,1154904987,0),(1,183,1154929665,0),(3,13,1154931268,0),(1,85,1154936888,0),(1,169,1154937959,0),(2,169,1154941717,0),(3,183,1154939810,0),(3,169,1154941734,0);
1010
Assertion: mysql_errname ER_STACK_OVERRUN_NEED_MORE == ER_STACK_OVERRUN_NEED_MORE
1111
DROP TABLE `t_bug21476`;

‎mysql-test/r/func_des_encrypt.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ des_encrypt('hello')
44
#
55
# Bug #11643: des_encrypt() causes server to die
66
#
7-
CREATE TABLE t1 (des VARBINARY(200) NOT NULL DEFAULT '') ENGINE=MyISAM;
7+
CREATE TABLE t1 (des VARBINARY(200) NOT NULL DEFAULT '');
88
INSERT INTO t1 VALUES ('1234'), ('12345'), ('123456'), ('1234567');
99
UPDATE t1 SET des=DES_ENCRYPT('1234');
1010
SELECT LENGTH(des) FROM t1;

‎mysql-test/r/func_encrypt.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ Warning 1681 'EXTENDED' is deprecated and will be removed in a future release.
186186
Note 1003 /* select#1 */ select des_decrypt(des_encrypt('hello',4),'password2') AS `des_decrypt(des_encrypt("hello",4),'password2')`,des_decrypt(des_encrypt('hello','hidden')) AS `des_decrypt(des_encrypt("hello","hidden"))`
187187
drop table if exists t1;
188188
create table t1 (f1 smallint(6) default null, f2 mediumtext character set utf8)
189-
engine=myisam default charset=latin1;
189+
default charset=latin1;
190190
insert into t1 values (null,'contraction\'s');
191191
insert into t1 values (-15818,'requirement\'s');
192192
select encrypt(f1,f2) as a from t1,(select encrypt(f1,f2) as b from t1) a;

‎mysql-test/r/func_if.result

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ drop table if exists t1;
22
select IF(0,"ERROR","this"),IF(1,"is","ERROR"),IF(NULL,"ERROR","a"),IF(1,2,3)|0,IF(1,2.0,3.0)+0 ;
33
IF(0,"ERROR","this") IF(1,"is","ERROR") IF(NULL,"ERROR","a") IF(1,2,3)|0 IF(1,2.0,3.0)+0
44
this is a 2 2.0
5-
CREATE TABLE t1 (st varchar(255) NOT NULL, u int(11) NOT NULL) ENGINE=MyISAM;
5+
CREATE TABLE t1 (st varchar(255) NOT NULL, u int(11) NOT NULL);
66
INSERT INTO t1 VALUES ('a',1),('A',1),('aa',1),('AA',1),('a',1),('aaa',0),('BBB',0);
77
select if(1,st,st) s from t1 order by s;
88
s
@@ -39,6 +39,9 @@ a
3939
a
4040
aa
4141
aaa
42+
analyze table t1;
43+
Table Op Msg_type Msg_text
44+
test.t1 analyze status OK
4245
explain extended select if(u=1,st,binary st) s from t1 where st like "%a%" order by s;
4346
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
4447
1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 7 100.00 Using where; Using filesort

‎mysql-test/r/func_set.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ CAST(DATE(NULL) AS DECIMAL), CAST(DATE(NULL) AS DECIMAL))
106106
End of 5.0 tests
107107
drop table if exists t1;
108108
create table t1 (f1 set('test1','test2','test3') character set utf8 default null)
109-
engine=myisam default charset=latin1;
109+
default charset=latin1;
110110
insert into t1 values (''),(null),(null),(''),(''),('');
111111
select find_in_set(f1,f1) as a from t1,(select find_in_set(f1,f1) as b from t1) a;
112112
a

‎mysql-test/r/grant_explain_non_select.result

+6-6
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
9292
GRANT UPDATE, SELECT ON privtest_db.t1 TO 'privtest'@'localhost';
9393
EXPLAIN UPDATE t1 SET a = a + 1;
9494
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
95-
1 UPDATE t1 NULL ALL NULL NULL NULL NULL 8 100.00 NULL
95+
1 UPDATE t1 NULL ALL NULL NULL NULL NULL x 100.00 NULL
9696
UPDATE t1 SET a = a + 1;
9797
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
9898
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
99-
1 SIMPLE t2 NULL ALL NULL NULL NULL NULL 3 100.00 NULL
100-
1 UPDATE t1 NULL ALL NULL NULL NULL NULL 8 100.00 Using where; Using join buffer (Block Nested Loop)
99+
1 SIMPLE t2 NULL ALL NULL NULL NULL NULL x 100.00 NULL
100+
1 UPDATE t1 NULL ALL NULL NULL NULL NULL x 100.00 Using where; Using join buffer (Block Nested Loop)
101101
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
102102
REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
103103
EXPLAIN DELETE FROM t1 WHERE a = 10;
@@ -131,12 +131,12 @@ REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
131131
GRANT DELETE, SELECT ON privtest_db.t1 TO 'privtest'@'localhost';
132132
EXPLAIN DELETE FROM t1 WHERE a = 10;
133133
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
134-
1 DELETE t1 NULL ALL NULL NULL NULL NULL 8 100.00 Using where
134+
1 DELETE t1 NULL ALL NULL NULL NULL NULL x 100.00 Using where
135135
DELETE FROM t1 WHERE a = 10;
136136
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
137137
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
138-
1 SIMPLE t2 NULL ALL NULL NULL NULL NULL 3 100.00 NULL
139-
1 DELETE t1 NULL ALL NULL NULL NULL NULL 8 100.00 Using where; Using join buffer (Block Nested Loop)
138+
1 SIMPLE t2 NULL ALL NULL NULL NULL NULL x 100.00 NULL
139+
1 DELETE t1 NULL ALL NULL NULL NULL NULL x 100.00 Using where; Using join buffer (Block Nested Loop)
140140
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
141141
REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
142142
CREATE VIEW privtest_db.v1 (a) AS SELECT a FROM privtest_db.t1;

‎mysql-test/r/join_crash.result

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ billing_contact_ptr int(11) default NULL,
1010
comments mediumtext,
1111
PRIMARY KEY (project_id),
1212
UNIQUE KEY project (client_ptr,project_name)
13-
) ENGINE=MyISAM PACK_KEYS=1;
13+
) PACK_KEYS=1;
1414
INSERT INTO t1 VALUES (1,0,'Rejected Time',1,NULL,NULL,NULL,NULL);
1515
INSERT INTO t1 VALUES (209,0,'MDGRAD Proposal/Investigation',97,NULL,NULL,NULL,'');
1616
INSERT INTO t1 VALUES (208,0,'Font 9 Design',84,NULL,NULL,NULL,'');
@@ -31,7 +31,7 @@ work_load int(11) default NULL,
3131
PRIMARY KEY (period_id),
3232
KEY period_index (period_type,period_key),
3333
KEY date_index (start_date,end_date)
34-
) ENGINE=MyISAM PACK_KEYS=1;
34+
) PACK_KEYS=1;
3535
INSERT INTO t2 VALUES (1,'user_table',98,'2000-01-01 00:00:00',NULL,NULL);
3636
INSERT INTO t2 VALUES (2,'user_table',99,'2000-01-01 00:00:00',NULL,NULL);
3737
INSERT INTO t2 VALUES (3,'user_table',100,'2000-01-01 00:00:00',NULL,NULL);
@@ -57,7 +57,7 @@ amount_received float(10,2) default NULL,
5757
adjustment float(10,2) default NULL,
5858
PRIMARY KEY (budget_id),
5959
UNIQUE KEY po (project_ptr,po_number)
60-
) ENGINE=MyISAM PACK_KEYS=1;
60+
) PACK_KEYS=1;
6161
CREATE TABLE t4 (
6262
client_id int(11) NOT NULL auto_increment,
6363
client_row_lock int(11) NOT NULL default '0',
@@ -66,7 +66,7 @@ contact_ptr int(11) default NULL,
6666
comments mediumtext,
6767
PRIMARY KEY (client_id),
6868
UNIQUE KEY client_name (client_name)
69-
) ENGINE=MyISAM PACK_KEYS=1;
69+
) PACK_KEYS=1;
7070
INSERT INTO t4 VALUES (1,0,'CPS',NULL,NULL);
7171
select distinct
7272
t1.project_id as project_id,

‎mysql-test/r/key_diff.result

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ b A a a
3333
C c a a
3434
D E a a
3535
a a a a
36+
analyze table t1;
37+
Table Op Msg_type Msg_text
38+
test.t1 analyze status OK
3639
explain select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B;
3740
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
3841
1 SIMPLE t1 NULL ALL a NULL NULL NULL 5 100.00 NULL

‎mysql-test/r/loaddata.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ SET @OLD_SQL_MODE=@@SESSION.SQL_MODE;
339339
test LOAD DATA INFILE
340340
SET sql_mode = '';
341341
SELECT '1 \\aa\n' INTO DUMPFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt';
342-
CREATE TABLE t1 (id INT, val1 CHAR(3)) ENGINE=MyISAM;
342+
CREATE TABLE t1 (id INT, val1 CHAR(3));
343343
SET sql_mode = 'NO_BACKSLASH_ESCAPES';
344344
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug37114.txt' REPLACE INTO TABLE t1 FIELDS TERMINATED BY ' ';
345345
SELECT * FROM t1;

‎mysql-test/r/loadxml.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ create table t1 (
6565
id int(11) not null,
6666
text text,
6767
primary key (id)
68-
) engine=MyISAM default charset=latin1;
68+
) default charset=latin1;
6969
load xml infile '../../std_data/loadxml2.dat' into table t1;
7070
select * from t1;
7171
id text

‎mysql-test/r/lowercase_mixed_tmpdir.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
drop table if exists t1;
2-
create table t1 (id int) engine=myisam;
2+
create table t1 (id int);
33
insert into t1 values (1);
44
create temporary table t2 select * from t1;
55
drop temporary table t2;

‎mysql-test/r/lowercase_view.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ End of 5.0 tests.
155155
CREATE TABLE `ttt` (
156156
`f1` char(3) NOT NULL,
157157
PRIMARY KEY (`f1`)
158-
) ENGINE=myisam DEFAULT CHARSET=latin1;
158+
)DEFAULT CHARSET=latin1;
159159
SELECT count(COLUMN_NAME) FROM INFORMATION_SCHEMA.STATISTICS WHERE TABLE_NAME =
160160
'TTT';
161161
count(COLUMN_NAME)

‎mysql-test/r/odbc.result

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ a b
1111
select * from t1 where a is null;
1212
a b
1313
2 2
14+
analyze table t1;
15+
Table Op Msg_type Msg_text
16+
test.t1 analyze status OK
1417
explain select * from t1 where b is null;
1518
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
1619
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE

‎mysql-test/r/olap.result

+6-3
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ TV 2 2000 200
8686
TV 2 NULL 200
8787
TV NULL NULL 600
8888
NULL NULL NULL 7785
89+
analyze table t1;
90+
Table Op Msg_type Msg_text
91+
test.t1 analyze status OK
8992
explain extended select product, country_id , year, sum(profit) from t1 group by product, country_id, year with rollup;
9093
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
9194
1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 15 100.00 Using filesort
@@ -711,23 +714,23 @@ End of 5.0 tests
711714
#
712715
# Bug#13011553 CRASH IN SORTCMP OR CACHED_ITEM_STR::CMP IF GROUP BY SUBQUERY WITH ROLLUP
713716
#
714-
CREATE TABLE t1 (f1 DATETIME) ENGINE = MyISAM;
717+
CREATE TABLE t1 (f1 DATETIME);
715718
INSERT INTO t1 VALUES ('2012-12-20 00:00:00'), (NULL);
716719
SELECT f1 FROM t1 GROUP BY
717720
(SELECT f1 FROM t1 HAVING f1 < '2012-12-21 00:00:00') WITH ROLLUP;
718721
f1
719722
2012-12-20 00:00:00
720723
2012-12-20 00:00:00
721724
DROP TABLE t1;
722-
CREATE TABLE t1 (f1 DATE) ENGINE = MyISAM;
725+
CREATE TABLE t1 (f1 DATE);
723726
INSERT INTO t1 VALUES ('2012-12-20'), (NULL);
724727
SELECT f1 FROM t1 GROUP BY
725728
(SELECT f1 FROM t1 HAVING f1 < '2012-12-21') WITH ROLLUP;
726729
f1
727730
2012-12-20
728731
2012-12-20
729732
DROP TABLE t1;
730-
CREATE TABLE t1 (f1 TIME) ENGINE = MyISAM;
733+
CREATE TABLE t1 (f1 TIME);
731734
INSERT INTO t1 VALUES ('11:11:11'), (NULL);
732735
SELECT f1 FROM t1 GROUP BY
733736
(SELECT f1 FROM t1 HAVING f1 < '12:12:12') WITH ROLLUP;

‎mysql-test/r/sp-error.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -1610,7 +1610,7 @@ DROP TABLE t1|
16101610
drop procedure if exists p1;
16111611
create procedure p1()
16121612
begin
1613-
create table t1 (a int) engine=MyISAM;
1613+
create table t1 (a int);
16141614
drop table t1;
16151615
end|
16161616
call p1();

‎mysql-test/r/type_year.result

+4-4
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,16 @@ yy c2 yyyy c4
101101
1999 1999 2069 2069
102102
2000 2000 2069 2069
103103
2001 2001 2069 2069
104-
SELECT * FROM t2, t4 WHERE yy > yyyy;
104+
SELECT * FROM t2, t4 WHERE yy > yyyy ORDER BY yy,yyyy;
105105
yy c2 yyyy c4
106106
1999 1999 1970 1970
107107
2000 2000 1970 1970
108-
2001 2001 1970 1970
109-
2069 2069 1970 1970
110108
2000 2000 1999 1999
109+
2001 2001 1970 1970
111110
2001 2001 1999 1999
112-
2069 2069 1999 1999
113111
2001 2001 2000 2000
112+
2069 2069 1970 1970
113+
2069 2069 1999 1999
114114
2069 2069 2000 2000
115115
2069 2069 2001 2001
116116
# Comparison of YEAR(2) with YEAR(2)

‎mysql-test/r/xml.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ CREATE TABLE IF NOT EXISTS t1 (
10681068
id int(10) unsigned NOT NULL AUTO_INCREMENT,
10691069
xml text,
10701070
PRIMARY KEY (id)
1071-
) ENGINE=MyISAM;
1071+
);
10721072
INSERT INTO t1 (id, xml) VALUES
10731073
(15, '<?xml version="1.0"?><bla name="blubb"></bla>'),
10741074
(14, '<xml version="kaputt">');

‎mysql-test/t/alias.test

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# The include statement below is a temp one for tests that are yet to
2-
#be ported to run with InnoDB,
3-
#but needs to be kept for tests that would need MyISAM in future.
4-
--source include/force_myisam_default.inc
5-
61
--disable_warnings
72
DROP TABLE IF EXISTS t1;
83
--enable_warnings
@@ -55,7 +50,7 @@ CREATE TABLE t1 (
5550
KEY mcbs_aufnr(mcbs_aufnr),
5651
KEY kundentyp(kundentyp),
5752
KEY p_nr(p_nr,suffix)
58-
) ENGINE=MyISAM;
53+
);
5954

6055
INSERT INTO t1 VALUES (3359356,405,3359356,'Mustermann Musterfrau',52500,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und gepr�ft','','privat',1485525,2122316,'+','','N',1909160,'MobilComSuper92000D2',NULL,NULL,'MS9ND2',3,24,'MobilCom Shop Koeln',52500,NULL,'auto',20010202105916,'Mobilfunk','PP','','','');
6156
INSERT INTO t1 VALUES (3359357,468,3359357,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und gepr�ft','','privat',1503580,2139699,'+','','P',1909171,'MobilComSuper9D1T10SFreisprech(Akquise)',NULL,NULL,'MS9NS1',327,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','','');

‎mysql-test/t/almost_full.test

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# The include statement below is a temp one for tests that are yet to
2-
#be ported to run with InnoDB,
3-
#but needs to be kept for tests that would need MyISAM in future.
4-
--source include/force_myisam_default.inc
5-
1+
# Test needs myisam for some myisam specific testcases
2+
--source include/have_myisam.inc
63
#
74
# Some special cases with empty tables
85
#

‎mysql-test/t/analyze.test

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# The include statement below is a temp one for tests that are yet to
2-
#be ported to run with InnoDB,
3-
#but needs to be kept for tests that would need MyISAM in future.
4-
--source include/force_myisam_default.inc
5-
61
#
72
# Bug #10901 Analyze Table on new table destroys table
83
# This is minimal test case to get error
@@ -50,7 +45,7 @@ drop table t1;
5045
# contains stopwords only. The first execution of analyze table should
5146
# mark index statistics as up to date so that next execution of this
5247
# statement will end up with Table is up to date status.
53-
create table t1 (a mediumtext, fulltext key key1(a)) charset utf8 collate utf8_general_ci engine myisam;
48+
create table t1 (a mediumtext, fulltext key key1(a)) charset utf8 collate utf8_general_ci;
5449
insert into t1 values ('hello');
5550

5651
analyze table t1;

0 commit comments

Comments
 (0)