#At lp:maria
2754 [email protected] 2009-10-06
Fix test failures in innodb-index and partition_special_*:
- innodb-index needs regexp replace for embedded like other similar
tests.
- partitions_special_* need to be modified for the extension from 16 to
32
max key parts allowed that was made in MariaDB.
modified:
mysql-test/r/innodb-index.result
mysql-test/suite/parts/inc/partition_key_32col.inc
mysql-test/suite/parts/r/partition_special_innodb.result
mysql-test/suite/parts/r/partition_special_myisam.result
mysql-test/t/innodb-index.test
=== modified file 'mysql-test/r/innodb-index.result'
--- a/mysql-test/r/innodb-index.result 2009-08-03 20:09:53 +0000
+++ b/mysql-test/r/innodb-index.result 2009-10-06 11:39:57 +0000
@@ -464,7 +464,7 @@ ERROR 23000: Cannot delete or update a p
drop index dc on t4;
ERROR 42000: Can't DROP 'dc'; check that column/key exists
alter table t3 drop foreign key dc;
-ERROR HY000: Error on rename of './test/t3' to '#sql2-temporary' (errno: 152)
+ERROR HY000: Error on rename of './test/t3' to './#sql2-temporary' (errno: 152)
alter table t4 drop foreign key dc;
select * from t2;
a b c d e
=== modified file 'mysql-test/suite/parts/inc/partition_key_32col.inc'
--- a/mysql-test/suite/parts/inc/partition_key_32col.inc 2009-01-31
15:47:35 +0000
+++ b/mysql-test/suite/parts/inc/partition_key_32col.inc 2009-10-06
11:39:57 +0000
@@ -1,10 +1,19 @@
+# In MariaDB, max key parts is extended from 16 to 32. But 33 keys don't work.
--error ER_TOO_MANY_KEY_PARTS
+eval create table t1 (a date not null, b varchar(50) not null, c varchar(50)
not null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null,
g bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not
null, c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1
decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not
null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not
null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2
tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not
null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null,
g3 bigint not null, h3 tinyint not null, i char(255), primary
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3,a4))
engine=$engine
+partition by
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3,a4)
(
+partition pa1 max_rows=20 min_rows=2,
+partition pa2 max_rows=30 min_rows=3,
+partition pa3 max_rows=30 min_rows=4,
+partition pa4 max_rows=40 min_rows=2);
+
eval create table t1 (a date not null, b varchar(50) not null, c varchar(50)
not null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null,
g bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not
null, c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1
decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not
null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not
null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2
tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not
null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null,
g3 bigint not null, h3 tinyint not null, i char(255), primary
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3))
engine=$engine
partition by
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3)
(
partition pa1 max_rows=20 min_rows=2,
partition pa2 max_rows=30 min_rows=3,
partition pa3 max_rows=30 min_rows=4,
partition pa4 max_rows=40 min_rows=2);
+drop table t1;
eval create table t1 (a date not null, b varchar(50) not null, c varchar(50)
not null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null,
g bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not
null, c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1
decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not
null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not
null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2
tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not
null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null,
g3 bigint not null, h3 tinyint not null, i char(255), primary
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1)) engine=$engine
partition by key(a,b,c,d,e,f,g,h) (
=== modified file 'mysql-test/suite/parts/r/partition_special_innodb.result'
--- a/mysql-test/suite/parts/r/partition_special_innodb.result 2008-12-04
09:47:25 +0000
+++ b/mysql-test/suite/parts/r/partition_special_innodb.result 2009-10-06
11:39:57 +0000
@@ -127,13 +127,20 @@ a b c d e f g h
a1 b1 c1 d1 e1 f1 g1 h1
1980-10-14 fgbbd dtzndtz w 67856 5463354.67 3567845333
124 1980-10-14 fgbbd dtzndtz w 67856 5463354.67
3567845333 124 d,f söierugsig msireg siug ei5ggth
lrutluitgzeöjrtnb.rkjthuekuhzrkuthgjdnffjmbr
1975-01-01 abcde abcde m 1234 123.45 32412341234 113
1975-01-01 abcde abcde m 1234 123.45 32412341234 113
tbhth nrzh ztfghgfh fzh ftzhj fztjh
drop table t1;
+create table t1 (a date not null, b varchar(50) not null, c varchar(50) not
null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null, g
bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not null,
c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1
decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not
null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not
null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2
tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not
null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null,
g3 bigint not null, h3 tinyint not null, i char(255), primary
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3,a4))
engine='InnoDB'
+partition by
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3,a4)
(
+partition pa1 max_rows=20 min_rows=2,
+partition pa2 max_rows=30 min_rows=3,
+partition pa3 max_rows=30 min_rows=4,
+partition pa4 max_rows=40 min_rows=2);
+ERROR 42000: Too many key parts specified; max 32 parts allowed
create table t1 (a date not null, b varchar(50) not null, c varchar(50) not
null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null, g
bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not null,
c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1
decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not
null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not
null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2
tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not
null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null,
g3 bigint not null, h3 tinyint not null, i char(255), primary
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3))
engine='InnoDB'
partition by
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3)
(
partition pa1 max_rows=20 min_rows=2,
partition pa2 max_rows=30 min_rows=3,
partition pa3 max_rows=30 min_rows=4,
partition pa4 max_rows=40 min_rows=2);
-ERROR 42000: Too many key parts specified; max 16 parts allowed
+drop table t1;
create table t1 (a date not null, b varchar(50) not null, c varchar(50) not
null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null, g
bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not null,
c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1
decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not
null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not
null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2
tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not
null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null,
g3 bigint not null, h3 tinyint not null, i char(255), primary
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1)) engine='InnoDB'
partition by key(a,b,c,d,e,f,g,h) (
partition pa1 max_rows=20 min_rows=2,
=== modified file 'mysql-test/suite/parts/r/partition_special_myisam.result'
--- a/mysql-test/suite/parts/r/partition_special_myisam.result 2008-11-04
07:43:21 +0000
+++ b/mysql-test/suite/parts/r/partition_special_myisam.result 2009-10-06
11:39:57 +0000
@@ -127,13 +127,20 @@ a b c d e f g h
a1 b1 c1 d1 e1 f1 g1 h1
1980-10-14 fgbbd dtzndtz w 67856 5463354.67 3567845333
124 1980-10-14 fgbbd dtzndtz w 67856 5463354.67
3567845333 124 d,f söierugsig msireg siug ei5ggth
lrutluitgzeöjrtnb.rkjthuekuhzrkuthgjdnffjmbr
1975-01-01 abcde abcde m 1234 123.45 32412341234 113
1975-01-01 abcde abcde m 1234 123.45 32412341234 113
tbhth nrzh ztfghgfh fzh ftzhj fztjh
drop table t1;
+create table t1 (a date not null, b varchar(50) not null, c varchar(50) not
null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null, g
bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not null,
c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1
decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not
null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not
null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2
tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not
null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null,
g3 bigint not null, h3 tinyint not null, i char(255), primary
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3,a4))
engine='MyISAM'
+partition by
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3,a4)
(
+partition pa1 max_rows=20 min_rows=2,
+partition pa2 max_rows=30 min_rows=3,
+partition pa3 max_rows=30 min_rows=4,
+partition pa4 max_rows=40 min_rows=2);
+ERROR 42000: Too many key parts specified; max 32 parts allowed
create table t1 (a date not null, b varchar(50) not null, c varchar(50) not
null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null, g
bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not null,
c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1
decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not
null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not
null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2
tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not
null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null,
g3 bigint not null, h3 tinyint not null, i char(255), primary
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3))
engine='MyISAM'
partition by
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1,a2,b2,c2,d2,e2,f2,g2,h2,a3,b3,c3,d3,e3,f3,g3,h3)
(
partition pa1 max_rows=20 min_rows=2,
partition pa2 max_rows=30 min_rows=3,
partition pa3 max_rows=30 min_rows=4,
partition pa4 max_rows=40 min_rows=2);
-ERROR 42000: Too many key parts specified; max 16 parts allowed
+drop table t1;
create table t1 (a date not null, b varchar(50) not null, c varchar(50) not
null, d enum('m', 'w') not null, e int not null, f decimal (18,2) not null, g
bigint not null, h tinyint not null, a1 date not null, b1 varchar(50) not null,
c1 varchar(50) not null, d1 enum('m', 'w') not null, e1 int not null, f1
decimal (18,2) not null, g1 bigint not null, h1 tinyint not null, a2 date not
null, b2 varchar(50) not null, c2 varchar(50) not null, d2 enum('m', 'w') not
null, e2 int not null, f2 decimal (18,2) not null, g2 bigint not null, h2
tinyint not null, a3 date not null, b3 varchar(50) not null, c3 varchar(50) not
null, d3 enum('m', 'w') not null, e3 int not null, f3 decimal (18,2) not null,
g3 bigint not null, h3 tinyint not null, i char(255), primary
key(a,b,c,d,e,f,g,h,a1,b1,c1,d1,e1,f1,g1,h1)) engine='MyISAM'
partition by key(a,b,c,d,e,f,g,h) (
partition pa1 max_rows=20 min_rows=2,
=== modified file 'mysql-test/t/innodb-index.test'
--- a/mysql-test/t/innodb-index.test 2009-08-03 20:09:53 +0000
+++ b/mysql-test/t/innodb-index.test 2009-10-06 11:39:57 +0000
@@ -148,7 +148,9 @@ delete from t1;
--error ER_CANT_DROP_FIELD_OR_KEY
drop index dc on t4;
# there is no foreign key dc on t3
---replace_regex /'\.\/test\/#sql2-[0-9a-f-]*'/'#sql2-temporary'/
+# Embedded server doesn't chdir to data directory
+--replace_result $MYSQLTEST_VARDIR . mysqld.1/data/ ''
+--replace_regex /\/test\/#sql2-[0-9a-f-]*'/\/#sql2-temporary'/
--error ER_ERROR_ON_RENAME
alter table t3 drop foreign key dc;
alter table t4 drop foreign key dc;
_______________________________________________
Mailing list: https://launchpad.net/~maria-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~maria-developers
More help : https://help.launchpad.net/ListHelp
