Skip to content

M
mariadb
Commit 0c487a79 authored by brian@zim.tangent.org's avatar brian@zim.tangent.org
Browse files
Options

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  zim.tangent.org:/home/brian/mysql/dep-5.1
parents eb968344 0a5a30be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 299 deletions
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
View file @ 0c487a79
...@@ -197,7 +197,7 @@ connection con3; ...@@ -197,7 +197,7 @@ connection con3;
delete from t1; delete from t1;
delete from t2; delete from t2;
--disable_warnings --disable_warnings
alter table t2 type=MyISAM; alter table t2 engine=MyISAM;
--enable_warnings --enable_warnings
insert into t1 values (1); insert into t1 values (1);
begin; begin;
......
mysql-test/r/binlog_stm_mix_innodb_myisam.result
View file @ 0c487a79
...@@ -185,7 +185,7 @@ master-bin.000001 258 Query 1 # use `test`; insert into t1 values(18) ...@@ -185,7 +185,7 @@ master-bin.000001 258 Query 1 # use `test`; insert into t1 values(18)
master-bin.000001 346 Xid 1 # COMMIT /* xid= */ master-bin.000001 346 Xid 1 # COMMIT /* xid= */
delete from t1; delete from t1;
delete from t2; delete from t2;
alter table t2 type=MyISAM; alter table t2 engine=MyISAM;
insert into t1 values (1); insert into t1 values (1);
begin; begin;
select * from t1 for update; select * from t1 for update;
...@@ -239,20 +239,20 @@ master-bin.000001 373 Query 1 # use `test`; delete from t1 ...@@ -239,20 +239,20 @@ master-bin.000001 373 Query 1 # use `test`; delete from t1
master-bin.000001 450 Xid 1 # COMMIT /* xid= */ master-bin.000001 450 Xid 1 # COMMIT /* xid= */
master-bin.000001 477 Query 1 # use `test`; delete from t2 master-bin.000001 477 Query 1 # use `test`; delete from t2
master-bin.000001 554 Xid 1 # COMMIT /* xid= */ master-bin.000001 554 Xid 1 # COMMIT /* xid= */
master-bin.000001 581 Query 1 # use `test`; alter table t2 type=MyISAM master-bin.000001 581 Query 1 # use `test`; alter table t2 engine=MyISAM
master-bin.000001 670 Query 1 # use `test`; insert into t1 values (1) master-bin.000001 672 Query 1 # use `test`; insert into t1 values (1)
master-bin.000001 758 Xid 1 # COMMIT /* xid= */ master-bin.000001 760 Xid 1 # COMMIT /* xid= */
master-bin.000001 785 Query 1 # use `test`; insert into t2 values (20) master-bin.000001 787 Query 1 # use `test`; insert into t2 values (20)
master-bin.000001 874 Query 1 # use `test`; drop table t1,t2 master-bin.000001 876 Query 1 # use `test`; drop table t1,t2
master-bin.000001 953 Query 1 # use `test`; create temporary table ti (a int) engine=innodb master-bin.000001 955 Query 1 # use `test`; create temporary table ti (a int) engine=innodb
master-bin.000001 1063 Query 1 # use `test`; insert into ti values(1) master-bin.000001 1065 Query 1 # use `test`; insert into ti values(1)
master-bin.000001 1150 Xid 1 # COMMIT /* xid= */ master-bin.000001 1152 Xid 1 # COMMIT /* xid= */
master-bin.000001 1177 Query 1 # use `test`; create temporary table t1 (a int) engine=myisam master-bin.000001 1179 Query 1 # use `test`; create temporary table t1 (a int) engine=myisam
master-bin.000001 1287 Query 1 # use `test`; insert t1 values (1) master-bin.000001 1289 Query 1 # use `test`; insert t1 values (1)
master-bin.000001 1370 Query 1 # use `test`; create table t0 (n int) master-bin.000001 1372 Query 1 # use `test`; create table t0 (n int)
master-bin.000001 1456 Query 1 # use `test`; insert t0 select * from t1 master-bin.000001 1458 Query 1 # use `test`; insert t0 select * from t1
master-bin.000001 1545 Query 1 # use `test`; insert into t0 select GET_LOCK("lock1",null) master-bin.000001 1547 Query 1 # use `test`; insert into t0 select GET_LOCK("lock1",null)
master-bin.000001 1652 Query 1 # use `test`; create table t2 (n int) engine=innodb master-bin.000001 1654 Query 1 # use `test`; create table t2 (n int) engine=innodb
master-bin.000001 1752 Query 1 # use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti` master-bin.000001 1754 Query 1 # use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`
do release_lock("lock1"); do release_lock("lock1");
drop table t0,t2; drop table t0,t2;
mysql-test/r/ctype_ujis.result
View file @ 0c487a79
...@@ -132,7 +132,7 @@ a INTEGER NOT NULL, ...@@ -132,7 +132,7 @@ a INTEGER NOT NULL,
b VARCHAR(50) NOT NULL DEFAULT '', b VARCHAR(50) NOT NULL DEFAULT '',
PRIMARY KEY (a), PRIMARY KEY (a),
KEY b (b(10)) KEY b (b(10))
) TYPE=InnoDB CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci'; ) ENGINE=InnoDB CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd'); INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');
INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh'); INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');
INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl'); INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl');
...@@ -152,7 +152,7 @@ a INTEGER NOT NULL, ...@@ -152,7 +152,7 @@ a INTEGER NOT NULL,
b VARCHAR(50) NOT NULL DEFAULT '', b VARCHAR(50) NOT NULL DEFAULT '',
PRIMARY KEY (a), PRIMARY KEY (a),
KEY b (b(10)) KEY b (b(10))
) TYPE=MyISAM CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci'; ) ENGINE=MyISAM CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd'); INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');
INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh'); INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');
INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl'); INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl');
......
mysql-test/r/innodb_concurrent.result
View file @ 0c487a79
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 't1'
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
Warnings: Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...@@ -106,7 +106,7 @@ eta tipo c ...@@ -106,7 +106,7 @@ eta tipo c
2 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj 2 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
1 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk 1 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
drop table t1; drop table t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
Warnings: Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...@@ -239,7 +239,7 @@ a b ...@@ -239,7 +239,7 @@ a b
1 1 1 1
commit; commit;
drop table t1; drop table t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
Warnings: Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...@@ -323,7 +323,7 @@ eta tipo c ...@@ -323,7 +323,7 @@ eta tipo c
80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj 80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk 90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
drop table t1; drop table t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
Warnings: Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...@@ -407,7 +407,7 @@ eta tipo c ...@@ -407,7 +407,7 @@ eta tipo c
80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj 80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk 90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
drop table t1; drop table t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
Warnings: Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...@@ -478,7 +478,7 @@ eta tipo c ...@@ -478,7 +478,7 @@ eta tipo c
80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj 80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk 90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
drop table t1; drop table t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
Warnings: Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...@@ -549,7 +549,7 @@ eta tipo c ...@@ -549,7 +549,7 @@ eta tipo c
80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj 80 22 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk 90 11 kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
drop table t1; drop table t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) ENGINE=innodb;
Warnings: Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
......
mysql-test/r/rpl_heap.result
View file @ 0c487a79
reset master; reset master;
drop table if exists t1; drop table if exists t1;
create table t1 type=HEAP select 10 as a; create table t1 ENGINE=HEAP select 10 as a;
insert into t1 values(11); insert into t1 values(11);
show binlog events from 79; show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info Log_name Pos Event_type Server_id Orig_log_pos Info
master-bin.001 79 Query 1 79 use `test`; create table t1 type=HEAP select 10 as a master-bin.001 79 Query 1 79 use `test`; create table t1 ENGINE=HEAP select 10 as a
master-bin.001 154 Query 1 154 use `test`; insert into t1 values(11) master-bin.001 154 Query 1 154 use `test`; insert into t1 values(11)
reset slave; reset slave;
start slave; start slave;
...@@ -12,7 +12,7 @@ show create table t1; ...@@ -12,7 +12,7 @@ show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`a` bigint(2) NOT NULL default '0' `a` bigint(2) NOT NULL default '0'
) TYPE=HEAP ) ENGINE=HEAP
select * from t1; select * from t1;
a a
10 10
......
mysql-test/r/warnings.result
View file @ 0c487a79
...@@ -166,13 +166,6 @@ show variables like 'max_error_count'; ...@@ -166,13 +166,6 @@ show variables like 'max_error_count';
Variable_name Value Variable_name Value
max_error_count 10 max_error_count 10
drop table t1; drop table t1;
create table t1 (id int) type=heap;
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
alter table t1 type=myisam;
Warnings:
Warning 1287 'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
drop table t1;
set table_type=MYISAM; set table_type=MYISAM;
Warnings: Warnings:
Warning 1287 'table_type' is deprecated; use 'storage_engine' instead Warning 1287 'table_type' is deprecated; use 'storage_engine' instead
......
mysql-test/t/ctype_ujis.test
View file @ 0c487a79
...@@ -94,7 +94,7 @@ CREATE TABLE t1 ...@@ -94,7 +94,7 @@ CREATE TABLE t1
b VARCHAR(50) NOT NULL DEFAULT '', b VARCHAR(50) NOT NULL DEFAULT '',
PRIMARY KEY (a), PRIMARY KEY (a),
KEY b (b(10)) KEY b (b(10))
) TYPE=InnoDB CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci'; ) ENGINE=InnoDB CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
--enable_warnings --enable_warnings
INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd'); INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');
INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh'); INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');
...@@ -110,7 +110,7 @@ CREATE TABLE t1 ...@@ -110,7 +110,7 @@ CREATE TABLE t1
b VARCHAR(50) NOT NULL DEFAULT '', b VARCHAR(50) NOT NULL DEFAULT '',
PRIMARY KEY (a), PRIMARY KEY (a),
KEY b (b(10)) KEY b (b(10))
) TYPE=MyISAM CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci'; ) ENGINE=MyISAM CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
--enable_warnings --enable_warnings
INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd'); INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');
INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh'); INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');
......
mysql-test/t/innodb_concurrent.test
View file @ 0c487a79
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
connection default; connection default;
drop table if exists t1; drop table if exists t1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb;
connect (thread1, localhost, mysqltest,,); connect (thread1, localhost, mysqltest,,);
connection thread1; connection thread1;
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
...@@ -57,7 +57,7 @@ drop table t1; ...@@ -57,7 +57,7 @@ drop table t1;
# #
#connect (thread1, localhost, mysqltest,,); #connect (thread1, localhost, mysqltest,,);
connection thread1; connection thread1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb;
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc"); insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc");
...@@ -132,7 +132,7 @@ drop table t1; ...@@ -132,7 +132,7 @@ drop table t1;
# #
#connect (thread1, localhost, mysqltest,,); #connect (thread1, localhost, mysqltest,,);
connection thread1; connection thread1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb;
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc"); insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc");
...@@ -175,7 +175,7 @@ drop table t1; ...@@ -175,7 +175,7 @@ drop table t1;
# #
#connect (thread1, localhost, mysqltest,,); #connect (thread1, localhost, mysqltest,,);
connection thread1; connection thread1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb;
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc"); insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc");
...@@ -218,7 +218,7 @@ drop table t1; ...@@ -218,7 +218,7 @@ drop table t1;
# #
#connect (thread1, localhost, mysqltest,,); #connect (thread1, localhost, mysqltest,,);
connection thread1; connection thread1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb;
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc"); insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc");
...@@ -261,7 +261,7 @@ drop table t1; ...@@ -261,7 +261,7 @@ drop table t1;
# #
#connect (thread1, localhost, mysqltest,,); #connect (thread1, localhost, mysqltest,,);
connection thread1; connection thread1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb;
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc"); insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc");
...@@ -305,7 +305,7 @@ drop table t1; ...@@ -305,7 +305,7 @@ drop table t1;
# #
#connect (thread1, localhost, mysqltest,,); #connect (thread1, localhost, mysqltest,,);
connection thread1; connection thread1;
create table t1(eta int(11) not null, tipo int(11), c varchar(255)) type=innodb; create table t1(eta int(11) not null, tipo int(11), c varchar(255)) engine=innodb;
insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); insert into t1 values (7,7, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); insert into t1 values (8,8, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc"); insert into t1 values (10,1,"ccccccccccccccccccccccccccccccccccccccccccc");
......
mysql-test/t/raid.test deleted 100644 → 0
View file @ eb968344
This diff is collapsed.
mysql-test/t/rpl_heap.test
View file @ 0c487a79
...@@ -18,7 +18,7 @@ reset master; ...@@ -18,7 +18,7 @@ reset master;
drop table if exists t1; drop table if exists t1;
# we use CREATE SELECT to verify that DELETE does not get into binlog # we use CREATE SELECT to verify that DELETE does not get into binlog
# before CREATE SELECT # before CREATE SELECT
create table t1 type=HEAP select 10 as a; create table t1 engine=HEAP select 10 as a;
insert into t1 values(11); insert into t1 values(11);
save_master_pos; save_master_pos;
--replace_column 2 # 5 # --replace_column 2 # 5 #
......
mysql-test/t/system_mysql_db_fix.test
View file @ 0c487a79
...@@ -38,7 +38,7 @@ CREATE TABLE db ( ...@@ -38,7 +38,7 @@ CREATE TABLE db (
PRIMARY KEY Host (Host,Db,User), PRIMARY KEY Host (Host,Db,User),
KEY User (User) KEY User (User)
) )
type=MyISAM; engine=MyISAM;
--enable-warnings --enable-warnings
INSERT INTO db VALUES ('%','test', '','Y','Y','Y','Y','Y','Y'); INSERT INTO db VALUES ('%','test', '','Y','Y','Y','Y','Y','Y');
...@@ -56,7 +56,7 @@ CREATE TABLE host ( ...@@ -56,7 +56,7 @@ CREATE TABLE host (
Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL, Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,
PRIMARY KEY Host (Host,Db) PRIMARY KEY Host (Host,Db)
) )
type=MyISAM; engine=MyISAM;
--enable-warnings --enable-warnings
--disable_warnings --disable_warnings
...@@ -75,7 +75,7 @@ CREATE TABLE user ( ...@@ -75,7 +75,7 @@ CREATE TABLE user (
Process_priv enum('N','Y') DEFAULT 'N' NOT NULL, Process_priv enum('N','Y') DEFAULT 'N' NOT NULL,
PRIMARY KEY Host (Host,User) PRIMARY KEY Host (Host,User)
) )
type=MyISAM; engine=MyISAM;
--enable-warnings --enable-warnings
INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y'); INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y');
......
mysql-test/t/warnings.test
View file @ 0c487a79
...@@ -117,14 +117,6 @@ drop table t1; ...@@ -117,14 +117,6 @@ drop table t1;
#alter table t1 engine=isam; #alter table t1 engine=isam;
#drop table t1; #drop table t1;
#
# Test for deprecated TYPE= syntax
#
create table t1 (id int) type=heap;
alter table t1 type=myisam;
drop table t1;
# #
# Test for deprecated table_type variable # Test for deprecated table_type variable
# #
......
scripts/fill_func_tables.sh
View file @ 0c487a79
...@@ -140,7 +140,7 @@ print " max_args tinyint,"; ...@@ -140,7 +140,7 @@ print " max_args tinyint,";
print " date_created datetime not null,"; print " date_created datetime not null,";
print " last_modified timestamp not null,"; print " last_modified timestamp not null,";
print " primary key (func_id)"; print " primary key (func_id)";
print ") type=myisam;\n\n"; print ") ENGINE=MYISAM;\n\n";
print "DROP TABLE IF EXISTS function_category_name;\n"; print "DROP TABLE IF EXISTS function_category_name;\n";
print "CREATE TABLE function_category_name ("; print "CREATE TABLE function_category_name (";
...@@ -150,14 +150,14 @@ print " url char(128) not null,"; ...@@ -150,14 +150,14 @@ print " url char(128) not null,";
print " date_created datetime not null,"; print " date_created datetime not null,";
print " last_modified timestamp not null,"; print " last_modified timestamp not null,";
print " primary key (cat_id)"; print " primary key (cat_id)";
print ") type=myisam;\n\n"; print ") ENGINE=MYISAM;\n\n";
print "DROP TABLE IF EXISTS function_category;\n"; print "DROP TABLE IF EXISTS function_category;\n";
print "CREATE TABLE function_category ("; print "CREATE TABLE function_category (";
print " cat_id smallint unsigned not null references function_category_name,"; print " cat_id smallint unsigned not null references function_category_name,";
print " func_id int unsigned not null references function,"; print " func_id int unsigned not null references function,";
print " primary key (cat_id, func_id)"; print " primary key (cat_id, func_id)";
print ") type=myisam;\n\n"; print ") ENGINE=MYISAM;\n\n";
print "DELETE FROM function_category_name;\n"; print "DELETE FROM function_category_name;\n";
print "DELETE FROM function_category;\n"; print "DELETE FROM function_category;\n";
......
scripts/mysql_convert_table_format.sh
View file @ 0c487a79
...@@ -69,7 +69,7 @@ foreach $table (@ARGV) ...@@ -69,7 +69,7 @@ foreach $table (@ARGV)
} }
} }
print "converting $table\n" if ($opt_verbose); print "converting $table\n" if ($opt_verbose);
if (!$dbh->do("ALTER TABLE $table type=$opt_type")) if (!$dbh->do("ALTER TABLE $table ENGINE=$opt_type"))
{ {
print STDERR "Can't convert $table: Error $DBI::errstr\n"; print STDERR "Can't convert $table: Error $DBI::errstr\n";
exit(1) if (!$opt_force); exit(1) if (!$opt_force);
...@@ -114,7 +114,7 @@ Conversion of a MySQL tables to other table types. ...@@ -114,7 +114,7 @@ Conversion of a MySQL tables to other table types.
--socket='/path/to/socket' --socket='/path/to/socket'
Socket to connect with. Socket to connect with.
--type='table-type' --ENGINE='table-type'
Converts tables to the given table type (Default: $opt_type) Converts tables to the given table type (Default: $opt_type)
MySQL 3.23 supports at least the BDB, ISAM and MYISAM types. MySQL 3.23 supports at least the BDB, ISAM and MYISAM types.
......
sql/ha_innodb.cc
View file @ 0c487a79
...@@ -5761,7 +5761,7 @@ ha_innobase::analyze( ...@@ -5761,7 +5761,7 @@ ha_innobase::analyze(
} }
/************************************************************************** /**************************************************************************
This is mapped to "ALTER TABLE tablename TYPE=InnoDB", which rebuilds This is mapped to "ALTER TABLE tablename ENGINE=InnoDB", which rebuilds
the table in MySQL. */ the table in MySQL. */
int int
......
sql/sql_yacc.yy
View file @ 0c487a79
...@@ -3991,7 +3991,6 @@ create_table_options: ...@@ -3991,7 +3991,6 @@ create_table_options:
create_table_option: create_table_option:
ENGINE_SYM opt_equal storage_engines { Lex->create_info.db_type= $3; Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE; } ENGINE_SYM opt_equal storage_engines { Lex->create_info.db_type= $3; Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE; }
| TYPE_SYM opt_equal storage_engines { Lex->create_info.db_type= $3; WARN_DEPRECATED("TYPE=storage_engine","ENGINE=storage_engine"); Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE; }
| MAX_ROWS opt_equal ulonglong_num { Lex->create_info.max_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS;} | MAX_ROWS opt_equal ulonglong_num { Lex->create_info.max_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS;}
| MIN_ROWS opt_equal ulonglong_num { Lex->create_info.min_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS;} | MIN_ROWS opt_equal ulonglong_num { Lex->create_info.min_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS;}
| AVG_ROW_LENGTH opt_equal ulong_num { Lex->create_info.avg_row_length=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;} | AVG_ROW_LENGTH opt_equal ulong_num { Lex->create_info.avg_row_length=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;}
......
tests/fork_big.pl
View file @ 0c487a79
...@@ -65,7 +65,7 @@ if (!$opt_skip_create) ...@@ -65,7 +65,7 @@ if (!$opt_skip_create)
} }
# Create the table we use to signal that we should end the test # Create the table we use to signal that we should end the test
$dbh->do("drop table if exists $abort_table"); $dbh->do("drop table if exists $abort_table");
$dbh->do("create table $abort_table (id int(6) not null) type=heap") || $dbh->do("create table $abort_table (id int(6) not null) ENGINE=heap") ||
die $DBI::errstr; die $DBI::errstr;
} }
......
tests/fork_big2.pl
View file @ 0c487a79
...@@ -89,7 +89,7 @@ if (!$opt_skip_create) ...@@ -89,7 +89,7 @@ if (!$opt_skip_create)
} }
# Create the table we use to signal that we should end the test # Create the table we use to signal that we should end the test
$dbh->do("drop table if exists $abort_table"); $dbh->do("drop table if exists $abort_table");
$dbh->do("create table $abort_table (id int(6) not null) type=heap") || $dbh->do("create table $abort_table (id int(6) not null) ENGINE=heap") ||
die $DBI::errstr; die $DBI::errstr;
} }
......
tests/mail_to_db.pl
View file @ 0c487a79
...@@ -253,7 +253,7 @@ CREATE TABLE my_mail ...@@ -253,7 +253,7 @@ CREATE TABLE my_mail
KEY (message_id), KEY (message_id),
KEY (in_reply_to), KEY (in_reply_to),
PRIMARY KEY (mail_from, date, hash)) PRIMARY KEY (mail_from, date, hash))
TYPE=MyISAM COMMENT='' ENGINE=MyISAM COMMENT=''
EOF EOF
$sth = $dbh->prepare($query) or die $DBI::errstr; $sth = $dbh->prepare($query) or die $DBI::errstr;
$sth->execute() or die "Couldn't create table: $DBI::errstr\n"; $sth->execute() or die "Couldn't create table: $DBI::errstr\n";
......
tests/mysql_client_test.c
View file @ 0c487a79
...@@ -1201,7 +1201,7 @@ static void test_tran_bdb() ...@@ -1201,7 +1201,7 @@ static void test_tran_bdb()
/* create the table 'mytran_demo' of type BDB' or 'InnoDB' */ /* create the table 'mytran_demo' of type BDB' or 'InnoDB' */
rc= mysql_query(mysql, "CREATE TABLE my_demo_transaction( " rc= mysql_query(mysql, "CREATE TABLE my_demo_transaction( "
"col1 int , col2 varchar(30)) TYPE= BDB"); "col1 int , col2 varchar(30)) ENGINE= BDB");
myquery(rc); myquery(rc);
/* insert a row and commit the transaction */ /* insert a row and commit the transaction */
...@@ -1274,7 +1274,7 @@ static void test_tran_innodb() ...@@ -1274,7 +1274,7 @@ static void test_tran_innodb()
/* create the table 'mytran_demo' of type BDB' or 'InnoDB' */ /* create the table 'mytran_demo' of type BDB' or 'InnoDB' */
rc= mysql_query(mysql, "CREATE TABLE my_demo_transaction(col1 int, " rc= mysql_query(mysql, "CREATE TABLE my_demo_transaction(col1 int, "
"col2 varchar(30)) TYPE= InnoDB"); "col2 varchar(30)) ENGINE= InnoDB");
myquery(rc); myquery(rc);
/* insert a row and commit the transaction */ /* insert a row and commit the transaction */
...@@ -9798,7 +9798,7 @@ static void test_derived() ...@@ -9798,7 +9798,7 @@ static void test_derived()
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "create table t1 (id int(8), primary key (id)) \ rc= mysql_query(mysql, "create table t1 (id int(8), primary key (id)) \
TYPE=InnoDB DEFAULT CHARSET=utf8"); ENGINE=InnoDB DEFAULT CHARSET=utf8");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "insert into t1 values (1)"); rc= mysql_query(mysql, "insert into t1 values (1)");
...@@ -9846,16 +9846,16 @@ static void test_xjoin() ...@@ -9846,16 +9846,16 @@ static void test_xjoin()
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1, t2, t3, t4"); rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1, t2, t3, t4");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "create table t3 (id int(8), param1_id int(8), param2_id int(8)) TYPE=InnoDB DEFAULT CHARSET=utf8"); rc= mysql_query(mysql, "create table t3 (id int(8), param1_id int(8), param2_id int(8)) ENGINE=InnoDB DEFAULT CHARSET=utf8");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "create table t1 ( id int(8), name_id int(8), value varchar(10)) TYPE=InnoDB DEFAULT CHARSET=utf8"); rc= mysql_query(mysql, "create table t1 ( id int(8), name_id int(8), value varchar(10)) ENGINE=InnoDB DEFAULT CHARSET=utf8");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "create table t2 (id int(8), name_id int(8), value varchar(10)) TYPE=InnoDB DEFAULT CHARSET=utf8;"); rc= mysql_query(mysql, "create table t2 (id int(8), name_id int(8), value varchar(10)) ENGINE=InnoDB DEFAULT CHARSET=utf8;");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "create table t4(id int(8), value varchar(10)) TYPE=InnoDB DEFAULT CHARSET=utf8"); rc= mysql_query(mysql, "create table t4(id int(8), value varchar(10)) ENGINE=InnoDB DEFAULT CHARSET=utf8");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "insert into t3 values (1, 1, 1), (2, 2, null)"); rc= mysql_query(mysql, "insert into t3 values (1, 1, 1), (2, 2, null)");
...@@ -14387,7 +14387,7 @@ static void test_bug14210() ...@@ -14387,7 +14387,7 @@ static void test_bug14210()
itself is not InnoDB related. In case the table is MyISAM this test itself is not InnoDB related. In case the table is MyISAM this test
is harmless. is harmless.
*/ */
mysql_query(mysql, "create table t1 (a varchar(255)) type=InnoDB"); mysql_query(mysql, "create table t1 (a varchar(255)) engine=InnoDB");
rc= mysql_query(mysql, "insert into t1 (a) values (repeat('a', 256))"); rc= mysql_query(mysql, "insert into t1 (a) values (repeat('a', 256))");
myquery(rc); myquery(rc);
rc= mysql_query(mysql, "set @@session.max_heap_table_size=16384"); rc= mysql_query(mysql, "set @@session.max_heap_table_size=16384");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7