Below is the list of changes that have just been committed into a local
5.1 repository of mleich. When mleich does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-08-16 19:29:49+02:00, mleich@stripped +15 -0
This changeset belongs to
WL#3397 Refactoring storage engine test cases (for falcon)
It contains fixes according to second code review.
- Remove any occurence of hardcoded assignments of storage engines
- Use variable names exact telling what it is used for
- Updated comments
- remove trailing spaces
mysql-test/include/handler.inc@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +13 -7
- Replace hardcoded MyISAM with assignments via variable
mysql-test/include/mix1.inc@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +30 -29
- Replace hardcoded MyISAM with assignments via variable
- Remove hardcoded InnoDB assignments (They were introduced by late push)
- Remove trailing spaces
mysql-test/include/mix2.inc@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +45 -35
- Replace hardcode MyISAM assignments
- Remove trailing spaces
- Engine assignments via variable refers to the use of the storage engine
$other_non_trans_engine_type, $other_live_chcks_engine_type ...
mysql-test/include/read_many_rows.inc@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +11 -4
Replace hardcoded MyISAM assignment
mysql-test/include/rowid_order.inc@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +7 -7
remove trailing spaces
mysql-test/r/handler_innodb.result@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +2 -2
Updated result
mysql-test/r/handler_myisam.result@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +1 -1
Updated result
mysql-test/r/innodb_mysql.result@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +16 -16
Updated result
mysql-test/r/mix2_myisam.result@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +6 -6
Updated result
mysql-test/r/read_many_rows_innodb.result@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +10 -9
Updated result
mysql-test/r/rowid_order_innodb.result@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +4 -4
Updated result
mysql-test/t/handler_innodb.test@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +2 -0
Introduce $variables
mysql-test/t/handler_myisam.test@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +4 -0
Introduce $variables
mysql-test/t/mix2_myisam.test@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +7 -0
Introduce $variables
mysql-test/t/read_many_rows_innodb.test@stripped, 2006-08-16 19:29:44+02:00, mleich@stripped +1 -0
Introduce $variables
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: mleich
# Host: three.local.lan
# Root: /home/matthias/Arbeit/mysql-5.1-engines/src-1
--- 1.8/mysql-test/r/innodb_mysql.result 2006-08-16 19:29:59 +02:00
+++ 1.9/mysql-test/r/innodb_mysql.result 2006-08-16 19:29:59 +02:00
@@ -12,7 +12,7 @@ org_id int(11) default null,
unique key contacts$c_id (c_id),
key contacts$org_id (org_id)
);
-insert into t1 values
+insert into t1 values
(2,null),(120,null),(141,null),(218,7), (128,1),
(151,2),(234,2),(236,2),(243,2),(255,2),(259,2),(232,3),(235,3),(238,3),
(246,3),(253,3),(269,3),(285,3),(291,3),(293,3),(131,4),(230,4),(231,4);
@@ -41,9 +41,9 @@ insert into t2(slai_id, owner_tbl, owner
flush tables;
select si.slai_id
from t1 c join t2 si on
-((si.owner_tbl = 3 and si.owner_id = c.org_id) or
-( si.owner_tbl = 2 and si.owner_id = c.c_id))
-where
+((si.owner_tbl = 3 and si.owner_id = c.org_id) or
+( si.owner_tbl = 2 and si.owner_id = c.c_id))
+where
c.c_id = 218 and expiredate is null;
slai_id
12
@@ -54,17 +54,17 @@ c_id org_id
141 NULL
select si.slai_id
from t1 c join t2 si on
-((si.owner_tbl = 3 and si.owner_id = c.org_id) or
-( si.owner_tbl = 2 and si.owner_id = c.c_id))
-where
+((si.owner_tbl = 3 and si.owner_id = c.org_id) or
+( si.owner_tbl = 2 and si.owner_id = c.c_id))
+where
c.c_id = 218 and expiredate is null;
slai_id
12
drop table t1, t2;
-CREATE TABLE t1 (a int, b int, KEY b (b)) Engine=InnoDB;
-CREATE TABLE t2 (a int, b int, PRIMARY KEY (a,b)) Engine=InnoDB;
-CREATE TABLE t3 (a int, b int, c int, PRIMARY KEY (a),
-UNIQUE KEY b (b,c), KEY a (a,b,c)) Engine=InnoDB;
+CREATE TABLE t1 (a int, b int, KEY b (b));
+CREATE TABLE t2 (a int, b int, PRIMARY KEY (a,b));
+CREATE TABLE t3 (a int, b int, c int, PRIMARY KEY (a),
+UNIQUE KEY b (b,c), KEY a (a,b,c));
INSERT INTO t1 VALUES (1, 1);
INSERT INTO t1 SELECT a + 1, b + 1 FROM t1;
INSERT INTO t1 SELECT a + 2, b + 2 FROM t1;
@@ -74,14 +74,14 @@ DELETE FROM t2 WHERE a = 1 AND b < 2;
INSERT INTO t3 VALUES (1,1,1),(2,1,2);
INSERT INTO t3 SELECT a + 2, a + 2, 3 FROM t3;
INSERT INTO t3 SELECT a + 4, a + 4, 3 FROM t3;
-SELECT STRAIGHT_JOIN SQL_NO_CACHE t1.b, t1.a FROM t1, t3, t2 WHERE
-t3.a = t2.a AND t2.b = t1.a AND t3.b = 1 AND t3.c IN (1, 2)
+SELECT STRAIGHT_JOIN SQL_NO_CACHE t1.b, t1.a FROM t1, t3, t2 WHERE
+t3.a = t2.a AND t2.b = t1.a AND t3.b = 1 AND t3.c IN (1, 2)
ORDER BY t1.b LIMIT 2;
b a
1 1
2 2
-SELECT STRAIGHT_JOIN SQL_NO_CACHE t1.b, t1.a FROM t1, t3, t2 WHERE
-t3.a = t2.a AND t2.b = t1.a AND t3.b = 1 AND t3.c IN (1, 2)
+SELECT STRAIGHT_JOIN SQL_NO_CACHE t1.b, t1.a FROM t1, t3, t2 WHERE
+t3.a = t2.a AND t2.b = t1.a AND t3.b = 1 AND t3.c IN (1, 2)
ORDER BY t1.b LIMIT 5;
b a
1 1
@@ -307,7 +307,7 @@ ERROR 23000: Duplicate entry '1' for key
SELECT * from t2;
a b
drop table t1,t2;
-create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb
+create table t1(f1 varchar(800) binary not null, key(f1))
character set utf8 collate utf8_general_ci;
Warnings:
Warning 1071 Specified key was too long; max key length is 765 bytes
--- 1.9/mysql-test/include/mix1.inc 2006-08-16 19:29:59 +02:00
+++ 1.10/mysql-test/include/mix1.inc 2006-08-16 19:29:59 +02:00
@@ -1,12 +1,13 @@
-# include/mix1.inc
+# include/mix1.inc
#
# The variables
# $engine_type -- storage engine to be tested
# $other_engine_type -- storage engine <> $engine_type
-# $other_engine_type should be an alltime
-# available storage engine like MyISAM or MEMORY
+# $other_engine_type must point to an all
+# time available storage engine
+# 2006-08 MySQL 5.1 MyISAM and MEMORY only
# have to be set before sourcing this script.
-#
+#
# Note: The comments/expectations refer to InnoDB.
# They might be not valid for other storage engines.
#
@@ -15,12 +16,12 @@
# - shift main code of t/innodb_mysql.test to include/mix1.inc
# - replace hardcoded assignment of storage engine by
# use of $engine_type and $other_engine_type variables
-# - remove redundant replay testcase of
+# - remove redundant replay testcase of
# Bug#12882 min/max inconsistent on empty table
# - corrected analyze table t1; to analyze table t4;
# Much older versions of this test show that the table
# where just some indexes have been created must be used.
-#
+#
eval SET SESSION STORAGE_ENGINE = $engine_type;
@@ -44,7 +45,7 @@ create table t1 (
unique key contacts$c_id (c_id),
key contacts$org_id (org_id)
);
-insert into t1 values
+insert into t1 values
(2,null),(120,null),(141,null),(218,7), (128,1),
(151,2),(234,2),(236,2),(243,2),(255,2),(259,2),(232,3),(235,3),(238,3),
(246,3),(253,3),(269,3),(285,3),(291,3),(293,3),(131,4),(230,4),(231,4);
@@ -75,17 +76,17 @@ insert into t2(slai_id, owner_tbl, owner
flush tables;
select si.slai_id
from t1 c join t2 si on
- ((si.owner_tbl = 3 and si.owner_id = c.org_id) or
- ( si.owner_tbl = 2 and si.owner_id = c.c_id))
-where
+ ((si.owner_tbl = 3 and si.owner_id = c.org_id) or
+ ( si.owner_tbl = 2 and si.owner_id = c.c_id))
+where
c.c_id = 218 and expiredate is null;
-
+
select * from t1 where org_id is null;
select si.slai_id
from t1 c join t2 si on
- ((si.owner_tbl = 3 and si.owner_id = c.org_id) or
- ( si.owner_tbl = 2 and si.owner_id = c.c_id))
-where
+ ((si.owner_tbl = 3 and si.owner_id = c.org_id) or
+ ( si.owner_tbl = 2 and si.owner_id = c.c_id))
+where
c.c_id = 218 and expiredate is null;
drop table t1, t2;
@@ -94,14 +95,14 @@ drop table t1, t2;
# Bug#17212: results not sorted correctly by ORDER BY when using index
# (repeatable only w/innodb because of index props)
#
-CREATE TABLE t1 (a int, b int, KEY b (b)) Engine=InnoDB;
-CREATE TABLE t2 (a int, b int, PRIMARY KEY (a,b)) Engine=InnoDB;
-CREATE TABLE t3 (a int, b int, c int, PRIMARY KEY (a),
- UNIQUE KEY b (b,c), KEY a (a,b,c)) Engine=InnoDB;
+CREATE TABLE t1 (a int, b int, KEY b (b));
+CREATE TABLE t2 (a int, b int, PRIMARY KEY (a,b));
+CREATE TABLE t3 (a int, b int, c int, PRIMARY KEY (a),
+ UNIQUE KEY b (b,c), KEY a (a,b,c));
INSERT INTO t1 VALUES (1, 1);
-INSERT INTO t1 SELECT a + 1, b + 1 FROM t1;
-INSERT INTO t1 SELECT a + 2, b + 2 FROM t1;
+INSERT INTO t1 SELECT a + 1, b + 1 FROM t1;
+INSERT INTO t1 SELECT a + 2, b + 2 FROM t1;
INSERT INTO t2 VALUES (1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(1,8);
INSERT INTO t2 SELECT a + 1, b FROM t2;
@@ -113,13 +114,13 @@ INSERT INTO t3 SELECT a + 4, a + 4, 3 FR
# demonstrate a problem when a must-use-sort table flag
# (sort_by_table=1) is being neglected.
-SELECT STRAIGHT_JOIN SQL_NO_CACHE t1.b, t1.a FROM t1, t3, t2 WHERE
- t3.a = t2.a AND t2.b = t1.a AND t3.b = 1 AND t3.c IN (1, 2)
+SELECT STRAIGHT_JOIN SQL_NO_CACHE t1.b, t1.a FROM t1, t3, t2 WHERE
+ t3.a = t2.a AND t2.b = t1.a AND t3.b = 1 AND t3.c IN (1, 2)
ORDER BY t1.b LIMIT 2;
# demonstrate the problem described in the bug report
-SELECT STRAIGHT_JOIN SQL_NO_CACHE t1.b, t1.a FROM t1, t3, t2 WHERE
- t3.a = t2.a AND t2.b = t1.a AND t3.b = 1 AND t3.c IN (1, 2)
+SELECT STRAIGHT_JOIN SQL_NO_CACHE t1.b, t1.a FROM t1, t3, t2 WHERE
+ t3.a = t2.a AND t2.b = t1.a AND t3.b = 1 AND t3.c IN (1, 2)
ORDER BY t1.b LIMIT 5;
DROP TABLE t1, t2, t3;
@@ -172,7 +173,7 @@ select count(*), min(7), max(7) from t2m
drop table t1m, t1i, t2m, t2i;
#
-# Bug #12882: primary key implcitly included in every innodb index
+# Bug #12882: primary key implcitly included in every innodb index
# (was part of group_min_max.test)
#
@@ -230,7 +231,7 @@ select distinct a1 from t4 where pk_col
drop table t1,t4;
#
-# Bug #6142: a problem with the empty innodb table
+# Bug #6142: a problem with the empty innodb table
# (was part of group_min_max.test)
#
@@ -243,7 +244,7 @@ select distinct a from t1;
drop table t1;
#
-# Bug #9798: group by with rollup
+# Bug #9798: group by with rollup
# (was part of group_min_max.test)
#
@@ -255,7 +256,7 @@ select a, count(a) from t1 group by a wi
drop table t1;
#
-# Bug #13293 Wrongly used index results in endless loop.
+# Bug #13293 Wrongly used index results in endless loop.
# (was part of group_min_max.test)
#
create table t1 (f1 int, f2 char(1), primary key(f1,f2));
@@ -317,7 +318,7 @@ drop table t1,t2;
#
# Bug#17530: Incorrect key truncation on table creation caused server crash.
#
-create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb
+create table t1(f1 varchar(800) binary not null, key(f1))
character set utf8 collate utf8_general_ci;
insert into t1 values('aaa');
drop table t1;
--- 1.2/mysql-test/include/mix2.inc 2006-08-16 19:29:59 +02:00
+++ 1.3/mysql-test/include/mix2.inc 2006-08-16 19:29:59 +02:00
@@ -2,7 +2,7 @@
# #
# include/mix2.inc #
# #
-# This is derivate of t/innodb.test and has to be maintained by MySQL #
+# This is a derivate of t/innodb.test and has to be maintained by MySQL #
# guys only. #
# #
# Please, DO NOT create a toplevel testcase mix2_innodb.test, because #
@@ -11,10 +11,20 @@
# Variables which have to be set before calling this script: #
# $engine_type -- Storage engine to be tested #
# $other_engine_type -- storage engine <> $engine_type #
-# 1. $other_engine_type should be an alltime #
-# available storage engine like MyISAM or MEMORY #
-# 2. If $engine_type is transactional than #
-# $other_engine_type must be non transactional #
+# $other_engine_type1 -- storage engine <> $engine_type #
+# storage engine <> $other_engine_type, if possible #
+# $other_non_trans_engine_type -- storage engine <> $engine_type #
+# $other_non_trans_engine_type must be a non #
+# transactional storage engine #
+# $other_non_live_chks_engine_type #
+# -- storage engine <> $engine_type, if possible #
+# storage engine must not support live checksum #
+# $other_live_chks_engine_type #
+# -- storage engine <> $engine_type, if possible #
+# storage engine must support live checksum #
+# General Note: The $other_*_engine_type variables must point to all #
+# time available storage engines #
+# 2006-08 MySQL 5.1 MyISAM and MEMORY only #
# $test_transactions -- 0, skip transactional tests #
# -- 1, do not skip transactional tests #
# $test_foreign_keys -- 0, skip foreign key tests #
@@ -25,7 +35,7 @@
# does not update the internal auto-increment value#
# -- 1, do not skip these tests #
# $no_spatial_key -- 0, skip tests where it is expected that keys on #
-# are not allowed #
+# spatial data type are not allowed #
# -- 1, do not skip these tests #
# #
# The comments/expectations refer to InnoDB. #
@@ -33,7 +43,7 @@
# #
# #
# Last update: #
-# 2006-08-15 ML - introduce $other_engine_type variable #
+# 2006-08-15 ML - introduce several $variables #
# - correct some storage engine assignments #
# - minor improvements like correct wrong table after analyze #
# - let checksum testcase meet all table variants with/without #
@@ -87,7 +97,7 @@ update t1 set parent_id=parent_id+100;
select * from t1 where parent_id=102;
update t1 set id=id+1000;
-- error 1062,1022
-update t1 set id=1024 where id=1009;
+update t1 set id=1024 where id=1009;
select * from t1;
update ignore t1 set id=id+1; # This will change all rows
select * from t1;
@@ -245,7 +255,7 @@ drop table t1;
#
# Simple not autocommit test
-#
+#
eval CREATE TABLE t1 (id char(8) not null primary key, val int not null) engine=$engine_type;
insert into t1 values ('pippo', 12);
@@ -440,7 +450,7 @@ INSERT INTO t1 values (179,5,2);
update t1 set parent_id=parent_id+100;
select * from t1 where parent_id=102;
update t1 set id=id+1000;
-update t1 set id=1024 where id=1009;
+update t1 set id=1024 where id=1009;
select * from t1;
update ignore t1 set id=id+1; # This will change all rows
select * from t1;
@@ -528,7 +538,7 @@ eval CREATE TABLE t1 (
b int1 unsigned NOT NULL,
UNIQUE (a, b)
) ENGINE = $engine_type;
-
+
INSERT INTO t1 VALUES (1, 1);
SELECT MIN(B),MAX(b) FROM t1 WHERE t1.a = 1;
drop table t1;
@@ -630,15 +640,15 @@ drop table t1;
#
# ML: Test logics
# Check that the creation of a table with engine = $engine_type does
-# in a certain database does not prevent the the dropping of this
-# database.
+# in a certain database (already containing some tables using other
+# storage engines) not prevent the dropping of this database.
create database mysqltest;
eval create table mysqltest.t1 (a int not null) engine= $engine_type;
insert into mysqltest.t1 values(1);
-create table mysqltest.t2 (a int not null) engine= MyISAM;
+eval create table mysqltest.t2 (a int not null) engine= $other_engine_type;
insert into mysqltest.t2 values(1);
-create table mysqltest.t3 (a int not null) engine= MEMORY;
+eval create table mysqltest.t3 (a int not null) engine= $other_engine_type1;
insert into mysqltest.t3 values(1);
commit;
drop database mysqltest;
@@ -752,7 +762,7 @@ select * from t1;
select * from t2;
delete t1, t2 from t1 left join t2 on t1.number=t2.number where (t1.carrier_id=90 and t1.number=t2.number) or (t2.carrier_id=90 and t1.number=t2.number) or (t1.carrier_id=90 and t2.number is null);
select * from t1;
-select * from t2;
+select * from t2;
select * from t2;
drop table t1,t2;
@@ -924,7 +934,7 @@ select * from t1;
select * from t2;
drop table t1,t2;
-eval CREATE TABLE t2 ( NEXT_T BIGINT NOT NULL PRIMARY KEY) ENGINE=$other_engine_type;
+eval CREATE TABLE t2 ( NEXT_T BIGINT NOT NULL PRIMARY KEY) ENGINE=$other_non_trans_engine_type;
eval CREATE TABLE t1 ( B_ID INTEGER NOT NULL PRIMARY KEY) ENGINE=$engine_type;
SET AUTOCOMMIT=0;
INSERT INTO t1 ( B_ID ) VALUES ( 1 );
@@ -1111,19 +1121,19 @@ eval CREATE TABLE t2 (
INSERT INTO t2 VALUES("3524", "1"),("3525", "1"),("1794", "4"),("102", "5"),("1822", "6"),("3382", "9");
SELECT t2.id, t1.`label` FROM t2 INNER JOIN
-(SELECT t1.id_object as id_object FROM t1 WHERE t1.`label` LIKE '%test%') AS lbl
+(SELECT t1.id_object as id_object FROM t1 WHERE t1.`label` LIKE '%test%') AS lbl
ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
drop table t1,t2;
# Live checksum feature available + enabled
-create table t1 (a int, b varchar(200), c text not null) checksum=1 engine=MyISAM;
+eval create table t1 (a int, b varchar(200), c text not null) checksum=1 engine=$other_live_chks_engine_type;
# Live checksum feature available + disabled
-create table t2 (a int, b varchar(200), c text not null) checksum=0 engine=MyISAM;
+eval create table t2 (a int, b varchar(200), c text not null) checksum=0 engine=$other_live_chks_engine_type;
#
# Live checksum feature not available + enabled
-create table t3 (a int, b varchar(200), c varchar(200) not null) checksum=1 engine=MEMORY;
+eval create table t3 (a int, b varchar(200), c varchar(200) not null) checksum=1 engine=$other_non_live_chks_engine_type;
# Live checksum feature not available + disabled
-create table t4 (a int, b varchar(200), c varchar(200) not null) checksum=0 engine=MEMORY;
+eval create table t4 (a int, b varchar(200), c varchar(200) not null) checksum=0 engine=$other_non_live_chks_engine_type;
#
# Live checksum feature probably available + enabled
eval create table t5 (a int, b varchar(200), c text not null) checksum=1 engine=$engine_type;
@@ -1231,7 +1241,7 @@ drop table t2, t1;
#
# Let us test binlog_cache_use and binlog_cache_disk_use status vars.
# Actually this test has nothing to do with innodb per se, it just requires
-# transactional table.
+# transactional table.
#
flush status;
show status like "binlog_cache_use";
@@ -1239,7 +1249,7 @@ show status like "binlog_cache_disk_use"
eval create table t1 (a int) engine=$engine_type;
-# Now we are going to create transaction which is long enough so its
+# Now we are going to create transaction which is long enough so its
# transaction binlog will be flushed to disk...
let $1=2000;
disable_query_log;
@@ -1297,7 +1307,7 @@ drop table t1;
if ($fulltext_query_unsupported)
{
#
-# BUG#7709 test case - Boolean fulltext query against unsupported
+# BUG#7709 test case - Boolean fulltext query against unsupported
# engines does not fail
#
@@ -1316,7 +1326,7 @@ if ($test_foreign_keys)
--disable_warnings
eval CREATE TABLE t1 (a_id tinyint(4) NOT NULL default '0', PRIMARY KEY (a_id)) ENGINE=$engine_type DEFAULT CHARSET=latin1;
INSERT INTO t1 VALUES (1),(2),(3);
-eval CREATE TABLE t2 (b_id tinyint(4) NOT NULL default '0',b_a tinyint(4) NOT NULL default '0', PRIMARY KEY (b_id), KEY (b_a),
+eval CREATE TABLE t2 (b_id tinyint(4) NOT NULL default '0',b_a tinyint(4) NOT NULL default '0', PRIMARY KEY (b_id), KEY (b_a),
CONSTRAINT fk_b_a FOREIGN KEY (b_a) REFERENCES t1 (a_id) ON DELETE CASCADE ON UPDATE NO ACTION) ENGINE=$engine_type DEFAULT CHARSET=latin1;
--enable_warnings
INSERT INTO t2 VALUES (1,1),(2,1),(3,1),(4,2),(5,2);
@@ -2145,7 +2155,7 @@ drop table t1,t2;
# tests for bug #14056 Column prefix index on UTF-8 primary key column causes 'Can't find record..'
eval create table t2 (
- a int, b char(10), filler char(10), primary key(a, b(2))
+ a int, b char(10), filler char(10), primary key(a, b(2))
) character set utf8 engine = $engine_type;
insert into t2 values (1,'abcdefg','one');
@@ -2154,7 +2164,7 @@ insert into t2 values (3, 'qrstuvw','thr
update t2 set a=5, filler='booo' where a=1;
drop table t2;
eval create table t2 (
- a int, b char(10), filler char(10), primary key(a, b(2))
+ a int, b char(10), filler char(10), primary key(a, b(2))
) character set ucs2 engine = $engine_type;
insert into t2 values (1,'abcdefg','one');
@@ -2245,7 +2255,7 @@ insert into t4(a) values (5),(7),(8);
insert into t5(a) values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12);
delimiter |;
-create trigger t1t before insert on t1 for each row begin
+create trigger t1t before insert on t1 for each row begin
INSERT INTO t2 SET a = NEW.a;
end |
@@ -2253,7 +2263,7 @@ create trigger t2t before insert on t2 f
DELETE FROM t3 WHERE a = NEW.a;
end |
-create trigger t3t before delete on t3 for each row begin
+create trigger t3t before delete on t3 for each row begin
UPDATE t4 SET b = b + 1 WHERE a = OLD.a;
end |
@@ -2379,14 +2389,14 @@ connection a;
eval create table t1(a int not null, b int, primary key(a)) engine=$engine_type;
insert into t1 values(1,1),(2,2),(3,1),(4,2),(5,1),(6,2),(7,3);
commit;
-set autocommit = 0;
+set autocommit = 0;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
update t1 set b = 5 where b = 1;
connection b;
set autocommit = 0;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
#
-# X-lock to record (7,3) should be released in a update
+# X-lock to record (7,3) should be released in a update
#
select * from t1 where a = 7 and b = 3 for update;
connection a;
@@ -2411,7 +2421,7 @@ connection a;
eval create table t1(a int not null, b int, primary key(a)) engine=$engine_type;
insert into t1 values(1,1),(2,2),(3,1),(4,2),(5,1),(6,2);
commit;
-set autocommit = 0;
+set autocommit = 0;
select * from t1 lock in share mode;
update t1 set b = 5 where b = 1;
connection b;
@@ -2467,7 +2477,7 @@ disconnect b;
drop table t1, t2, t3;
#
-# Consistent read should not be used if
+# Consistent read should not be used if
#
# (a) isolation level is serializable OR
# (b) select ... lock in share mode OR
@@ -2638,7 +2648,7 @@ eval CREATE TABLE t2 (
c TEXT NOT NULL,
PRIMARY KEY (a,b),
KEY idx_t2_b_c (b,c(200)),
- CONSTRAINT t_fk FOREIGN KEY (a) REFERENCES t1 (a)
+ CONSTRAINT t_fk FOREIGN KEY (a) REFERENCES t1 (a)
ON DELETE CASCADE
) ENGINE=$engine_type DEFAULT CHARSET=UTF8;
--- 1.2/mysql-test/r/mix2_myisam.result 2006-08-16 19:29:59 +02:00
+++ 1.3/mysql-test/r/mix2_myisam.result 2006-08-16 19:29:59 +02:00
@@ -764,7 +764,7 @@ drop table t1;
create database mysqltest;
create table mysqltest.t1 (a int not null) engine= MyISAM;
insert into mysqltest.t1 values(1);
-create table mysqltest.t2 (a int not null) engine= MyISAM;
+create table mysqltest.t2 (a int not null) engine= MEMORY;
insert into mysqltest.t2 values(1);
create table mysqltest.t3 (a int not null) engine= MEMORY;
insert into mysqltest.t3 values(1);
@@ -1208,7 +1208,7 @@ KEY `id_version` (`id_version`)
) ENGINE=MyISAM;
INSERT INTO t2 VALUES("3524", "1"),("3525", "1"),("1794", "4"),("102", "5"),("1822", "6"),("3382", "9");
SELECT t2.id, t1.`label` FROM t2 INNER JOIN
-(SELECT t1.id_object as id_object FROM t1 WHERE t1.`label` LIKE '%test%') AS lbl
+(SELECT t1.id_object as id_object FROM t1 WHERE t1.`label` LIKE '%test%') AS lbl
ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
id label
3382 Test
@@ -2331,7 +2331,7 @@ hex(ind) hex(string1)
1
drop table t1,t2;
create table t2 (
-a int, b char(10), filler char(10), primary key(a, b(2))
+a int, b char(10), filler char(10), primary key(a, b(2))
) character set utf8 engine = MyISAM;
insert into t2 values (1,'abcdefg','one');
insert into t2 values (2,'ijkilmn','two');
@@ -2339,7 +2339,7 @@ insert into t2 values (3, 'qrstuvw','thr
update t2 set a=5, filler='booo' where a=1;
drop table t2;
create table t2 (
-a int, b char(10), filler char(10), primary key(a, b(2))
+a int, b char(10), filler char(10), primary key(a, b(2))
) character set ucs2 engine = MyISAM;
insert into t2 values (1,'abcdefg','one');
insert into t2 values (2,'ijkilmn','two');
@@ -2398,13 +2398,13 @@ insert into t4(a) values (1),(2),(3);
insert into t3(a) values (5),(7),(8);
insert into t4(a) values (5),(7),(8);
insert into t5(a) values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(11),(12);
-create trigger t1t before insert on t1 for each row begin
+create trigger t1t before insert on t1 for each row begin
INSERT INTO t2 SET a = NEW.a;
end |
create trigger t2t before insert on t2 for each row begin
DELETE FROM t3 WHERE a = NEW.a;
end |
-create trigger t3t before delete on t3 for each row begin
+create trigger t3t before delete on t3 for each row begin
UPDATE t4 SET b = b + 1 WHERE a = OLD.a;
end |
create trigger t4t before update on t4 for each row begin
--- 1.2/mysql-test/t/handler_myisam.test 2006-08-16 19:29:59 +02:00
+++ 1.3/mysql-test/t/handler_myisam.test 2006-08-16 19:29:59 +02:00
@@ -13,5 +13,9 @@
--source include/not_embedded.inc
let $engine_type= MyISAM;
+let $other_engine_type= MEMORY;
+# There is unfortunately no other all time available storage engine
+# which supports the handler interface
+let $other_handler_engine_type= MyISAM;
--source include/handler.inc
--- 1.2/mysql-test/t/mix2_myisam.test 2006-08-16 19:29:59 +02:00
+++ 1.3/mysql-test/t/mix2_myisam.test 2006-08-16 19:29:59 +02:00
@@ -5,6 +5,13 @@
let $engine_type= MyISAM;
let $other_engine_type= MEMORY;
+# There are unfortunately only MyISAM and MEMORY all time available
+# Therefore use here MEMORY again.
+let $other_engine_type1= MEMORY;
+let $other_non_trans_engine_type= MEMORY;
+let $other_non_live_chks_engine_type= MEMORY;
+# Therefore use here MyISAM again.
+let $other_live_chks_engine_type= MyISAM;
# MyISAM does not support transactions
let $test_transactions= 0;
# MyISAM does not support FOREIGN KEYFOREIGN KEYs
--- 1.2/mysql-test/t/read_many_rows_innodb.test 2006-08-16 19:29:59 +02:00
+++ 1.3/mysql-test/t/read_many_rows_innodb.test 2006-08-16 19:29:59 +02:00
@@ -12,5 +12,6 @@
--source include/have_innodb.inc
let $engine_type= InnoDB;
+let $other_engine_type= MyISAM;
--source include/read_many_rows.inc
--- 1.3/mysql-test/r/read_many_rows_innodb.result 2006-08-16 19:29:59 +02:00
+++ 1.4/mysql-test/r/read_many_rows_innodb.result 2006-08-16 19:29:59 +02:00
@@ -1,8 +1,9 @@
+SET SESSION STORAGE_ENGINE = InnoDB;
DROP TABLE IF EXISTS t1, t2, t3, t4;
-CREATE TABLE t1 (id INTEGER) ENGINE=MYISAM;
-CREATE TABLE t2 (id INTEGER primary key) ENGINE=INNODB;
-CREATE TABLE t3 (a char(32) primary key,id INTEGER) ENGINE=INNODB;
-CREATE TABLE t4 (a char(32) primary key,id INTEGER) ENGINE=MYISAM;
+CREATE TABLE t1 (id INTEGER) ENGINE=MyISAM;
+CREATE TABLE t2 (id INTEGER PRIMARY KEY);
+CREATE TABLE t3 (a CHAR(32) PRIMARY KEY,id INTEGER);
+CREATE TABLE t4 (a CHAR(32) PRIMARY KEY,id INTEGER) ENGINE=MyISAM;
INSERT INTO t1 (id) VALUES (1);
INSERT INTO t1 SELECT id+1 FROM t1;
INSERT INTO t1 SELECT id+2 FROM t1;
@@ -26,9 +27,9 @@ INSERT INTO t1 SELECT id+262144 FROM t1;
INSERT INTO t1 SELECT id+524288 FROM t1;
INSERT INTO t1 SELECT id+1048576 FROM t1;
INSERT INTO t2 SELECT * FROM t1;
-INSERT INTO t3 SELECT concat(id),id from t2 ORDER BY -id;
-INSERT INTO t4 SELECT * from t3 ORDER BY concat(a);
-select sum(id) from t3;
-sum(id)
+INSERT INTO t3 SELECT CONCAT(id),id FROM t2 ORDER BY -id;
+INSERT INTO t4 SELECT * FROM t3 ORDER BY CONCAT(a);
+SELECT SUM(id) FROM t3;
+SUM(id)
2199024304128
-drop table t1,t2,t3,t4;
+DROP TABLE t1,t2,t3,t4;
--- 1.3/mysql-test/include/read_many_rows.inc 2006-08-16 19:29:59 +02:00
+++ 1.4/mysql-test/include/read_many_rows.inc 2006-08-16 19:29:59 +02:00
@@ -3,9 +3,16 @@
# Test how filesort and buffered-record-reads works
# This test needs a lot of time.
#
-# The variable
+# The variables
# $engine_type -- storage engine to be tested
-# has to be set before sourcing this script.
+# $other_engine_type -- storage engine <> $engine_type, if possible
+# 1. $other_engine_type must allow to store many rows
+# without using non standard server options
+# (does not need a t/read_many_rows_*-master.opt file)
+# 2. $other_engine_type must point to an all time
+# available storage engine
+# 2006-08 MySQL 5.1 MyISAM and MEMORY only
+# have to be set before sourcing this script.
#
# Last update:
# 2006-08-03 ML test refactored (MySQL 5.1)
@@ -18,10 +25,10 @@ eval SET SESSION STORAGE_ENGINE = $engin
DROP TABLE IF EXISTS t1, t2, t3, t4;
--enable_warnings
-CREATE TABLE t1 (id INTEGER) ENGINE=MYISAM;
+eval CREATE TABLE t1 (id INTEGER) ENGINE=$other_engine_type;
CREATE TABLE t2 (id INTEGER PRIMARY KEY);
CREATE TABLE t3 (a CHAR(32) PRIMARY KEY,id INTEGER);
-CREATE TABLE t4 (a CHAR(32) PRIMARY KEY,id INTEGER) ENGINE=MYISAM;
+eval CREATE TABLE t4 (a CHAR(32) PRIMARY KEY,id INTEGER) ENGINE=$other_engine_type;
INSERT INTO t1 (id) VALUES (1);
INSERT INTO t1 SELECT id+1 FROM t1;
--- 1.27/mysql-test/r/handler_myisam.result 2006-08-16 19:29:59 +02:00
+++ 1.28/mysql-test/r/handler_myisam.result 2006-08-16 19:29:59 +02:00
@@ -168,7 +168,7 @@ insert into t1 values (17);
handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER
handler t1 open as t2;
-alter table t1 engine=MyISAM;
+alter table t1 engine=MEMORY;
handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER
drop table t1;
--- 1.15/mysql-test/r/handler_innodb.result 2006-08-16 19:29:59 +02:00
+++ 1.16/mysql-test/r/handler_innodb.result 2006-08-16 19:29:59 +02:00
@@ -168,7 +168,7 @@ insert into t1 values (17);
handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER
handler t1 open as t2;
-alter table t1 engine=MyISAM;
+alter table t1 engine=MEMORY;
handler t2 read first;
ERROR 42S02: Unknown table 't2' in HANDLER
drop table t1;
@@ -457,7 +457,7 @@ t1
handler h1_3 read first limit 9;
c1
t1
-alter table t1 engine=MyISAM;
+alter table t1 engine=InnoDB;
handler h1_1 read first limit 9;
ERROR 42S02: Unknown table 'h1_1' in HANDLER
handler h1_2 read first limit 9;
--- 1.32/mysql-test/include/handler.inc 2006-08-16 19:29:59 +02:00
+++ 1.33/mysql-test/include/handler.inc 2006-08-16 19:29:59 +02:00
@@ -1,8 +1,14 @@
# include/handler.inc
#
-# The variable
+# The variables
# $engine_type -- storage engine to be tested
-# has to be set before sourcing this script.
+# $other_engine_type -- storage engine <> $engine_type
+# $other_handler_engine_type -- storage engine <> $engine_type, if possible
+# 1. $other_handler_engine_type must support handler
+# 2. $other_handler_engine_type must point to an all
+# time available storage engine
+# 2006-08 MySQL 5.1 MyISAM and MEMORY only
+# have to be set before sourcing this script.
#
# test of HANDLER ...
#
@@ -108,7 +114,7 @@ insert into t1 values (17);
--error 1109
handler t2 read first;
handler t1 open as t2;
-alter table t1 engine=MyISAM;
+eval alter table t1 engine=$other_engine_type;
--error 1109
handler t2 read first;
drop table t1;
@@ -327,7 +333,7 @@ insert into t5 values ("t5");
handler t5 open as h5;
handler h5 read first limit 9;
# close first
-alter table t1 engine=MyISAM;
+eval alter table t1 engine=$other_handler_engine_type;
--error 1109
handler h1 read first limit 9;
handler h2 read first limit 9;
@@ -335,7 +341,7 @@ handler h3 read first limit 9;
handler h4 read first limit 9;
handler h5 read first limit 9;
# close last
-alter table t5 engine=MyISAM;
+eval alter table t5 engine=$other_handler_engine_type;
--error 1109
handler h1 read first limit 9;
handler h2 read first limit 9;
@@ -344,7 +350,7 @@ handler h4 read first limit 9;
--error 1109
handler h5 read first limit 9;
# close middle
-alter table t3 engine=MyISAM;
+eval alter table t3 engine=$other_handler_engine_type;
--error 1109
handler h1 read first limit 9;
handler h2 read first limit 9;
@@ -362,7 +368,7 @@ handler t1 open as h1_3;
handler h1_1 read first limit 9;
handler h1_2 read first limit 9;
handler h1_3 read first limit 9;
-alter table t1 engine=MyISAM;
+eval alter table t1 engine=$engine_type;
--error 1109
handler h1_1 read first limit 9;
--error 1109
--- 1.14/mysql-test/t/handler_innodb.test 2006-08-16 19:29:59 +02:00
+++ 1.15/mysql-test/t/handler_innodb.test 2006-08-16 19:29:59 +02:00
@@ -14,5 +14,7 @@
--source include/have_innodb.inc
let $engine_type= InnoDB;
+let $other_engine_type= MEMORY;
+let $other_handler_engine_type= MyISAM;
--source include/handler.inc
--- 1.10/mysql-test/r/rowid_order_innodb.result 2006-08-16 19:29:59 +02:00
+++ 1.11/mysql-test/r/rowid_order_innodb.result 2006-08-16 19:29:59 +02:00
@@ -1,6 +1,6 @@
SET SESSION STORAGE_ENGINE = InnoDB;
drop table if exists t1, t2, t3,t4;
-create table t1 (
+create table t1 (
pk1 int not NULL,
key1 int(11),
key2 int(11),
@@ -24,7 +24,7 @@ pk1 key1 key2
3 1 1
10 1 1
drop table t1;
-create table t1 (
+create table t1 (
pk1 int unsigned not NULL,
key1 int(11),
key2 int(11),
@@ -45,7 +45,7 @@ pk1 key1 key2
4294967294 1 1
4294967295 1 1
drop table t1;
-create table t1 (
+create table t1 (
pk1 char(4) not NULL,
key1 int(11),
key2 int(11),
@@ -74,7 +74,7 @@ PRIMARY KEY (pk1,pk2,pk3),
KEY key1 (key1),
KEY key2 (key2)
);
-insert into t1 values
+insert into t1 values
(1, 'u', 'u', 1, 1),
(1, 'u', char(0xEC), 1, 1),
(1, 'u', 'x', 1, 1);
--- 1.6/mysql-test/include/rowid_order.inc 2006-08-16 19:29:59 +02:00
+++ 1.7/mysql-test/include/rowid_order.inc 2006-08-16 19:29:59 +02:00
@@ -1,7 +1,7 @@
# include/rowid_order.inc
#
# Test for rowid ordering (and comparison) functions.
-# do index_merge select for tables with PK of various types.
+# do index_merge select for tables with PK of various types.
#
# The variable
# $engine_type -- storage engine to be tested
@@ -22,8 +22,8 @@ eval SET SESSION STORAGE_ENGINE = $engin
drop table if exists t1, t2, t3,t4;
--enable_warnings
-# Signed number as rowid
-create table t1 (
+# Signed number as rowid
+create table t1 (
pk1 int not NULL,
key1 int(11),
key2 int(11),
@@ -40,8 +40,8 @@ explain select * from t1 force index(key
select * from t1 force index(key1, key2) where key1 < 3 or key2 < 3;
drop table t1;
-# Unsigned numbers as rowids
-create table t1 (
+# Unsigned numbers as rowids
+create table t1 (
pk1 int unsigned not NULL,
key1 int(11),
key2 int(11),
@@ -58,7 +58,7 @@ select * from t1 force index(key1, key2)
drop table t1;
# Case-insensitive char(N)
-create table t1 (
+create table t1 (
pk1 char(4) not NULL,
key1 int(11),
key2 int(11),
@@ -84,7 +84,7 @@ create table t1 (
KEY key1 (key1),
KEY key2 (key2)
);
-insert into t1 values
+insert into t1 values
(1, 'u', 'u', 1, 1),
(1, 'u', char(0xEC), 1, 1),
(1, 'u', 'x', 1, 1);
| Thread |
|---|
| • bk commit into 5.1 tree (mleich:1.2277) | mleich | 16 Aug |
