diff options
author | unknown <mattiasj@witty.ndb.mysql.com> | 2008-02-07 16:26:22 +0100 |
---|---|---|
committer | unknown <mattiasj@witty.ndb.mysql.com> | 2008-02-07 16:26:22 +0100 |
commit | 11b8c529ccbf2ed9d82a9c3bf26bb9c2c851893f (patch) | |
tree | e9b9cfa1a43d5893c4d606e303aea3b299034bd9 | |
parent | 1a6789fd68a3c2194f2fe69d26fb1aa7c3af8312 (diff) | |
download | mariadb-git-11b8c529ccbf2ed9d82a9c3bf26bb9c2c851893f.tar.gz |
Bug#34225: suite/parts test failure
Pre push fix:
added --sorted_result for consistent results
mysql-test/suite/parts/inc/partition_bit.inc:
Bug#34225: suite/parts test failure
added --sorted_result for consistent results
mysql-test/suite/parts/r/partition_bit_innodb.result:
Bug#34225: suite/parts test failure
added --sorted_result for consistent results
mysql-test/suite/parts/r/partition_bit_myisam.result:
Bug#34225: suite/parts test failure
added --sorted_result for consistent results
-rw-r--r-- | mysql-test/suite/parts/inc/partition_bit.inc | 7 | ||||
-rw-r--r-- | mysql-test/suite/parts/r/partition_bit_innodb.result | 58 | ||||
-rw-r--r-- | mysql-test/suite/parts/r/partition_bit_myisam.result | 56 |
3 files changed, 64 insertions, 57 deletions
diff --git a/mysql-test/suite/parts/inc/partition_bit.inc b/mysql-test/suite/parts/inc/partition_bit.inc index 3e37d7a68d1..5bbf0058028 100644 --- a/mysql-test/suite/parts/inc/partition_bit.inc +++ b/mysql-test/suite/parts/inc/partition_bit.inc @@ -25,6 +25,7 @@ insert into t1 values (b'0000000000000000000000000000000000000000000000000000000000000001'), (b'1010101010101010101010101010101010101010101010101010101010101010'), (b'0101010101010101010101010101010101010101010101010101010101010101'); +--sorted_result select hex(a) from t1; drop table t1; @@ -43,6 +44,7 @@ insert into t1 values (b'0101010101010101010101010101010101010101010101010101010101010101'); select hex(a) from t1 where a=b'0101010101010101010101010101010101010101010101010101010101010101'; delete from t1 where a=b'0101010101010101010101010101010101010101010101010101010101010101'; +--sorted_result select hex(a) from t1; drop table t1; @@ -50,12 +52,15 @@ eval create table t2 (a bit, primary key (a)) engine=$engine partition by key (a) partitions 4; show create table t2; insert into t2 values (b'0'), (b'1'); +--sorted_result select hex(a) from t2; alter table t2 drop primary key; show create table t2; +--sorted_result select hex(a) from t2; alter table t2 add primary key (a); show create table t2; +--sorted_result select hex(a) from t2; drop table t2; @@ -78,6 +83,7 @@ dec $count; select hex(a) from t3 where a=b'01010101'; delete from t3 where a=b'01010101'; select count(*) from t3; +--sorted_result select hex(a) from t3; drop table t3; @@ -99,5 +105,6 @@ dec $count; select hex(a) from t4 where a=b'00000001'; delete from t4 where a=b'00000001'; select count(*) from t4; +--sorted_result select hex(a) from t4; drop table t4; diff --git a/mysql-test/suite/parts/r/partition_bit_innodb.result b/mysql-test/suite/parts/r/partition_bit_innodb.result index 6920519e4db..22d1d0e0a30 100644 --- a/mysql-test/suite/parts/r/partition_bit_innodb.result +++ b/mysql-test/suite/parts/r/partition_bit_innodb.result @@ -93,8 +93,8 @@ t2 CREATE TABLE `t2` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) PARTITIONS 4 */ select hex(a) from t2; hex(a) -1 0 +1 alter table t2 add primary key (a); show create table t2; Table Create Table @@ -130,20 +130,6 @@ count(*) select hex(a) from t3; hex(a) 1 -2 -3 -4 -5 -6 -7 -8 -9 -A -B -C -D -E -F 10 11 12 @@ -160,6 +146,7 @@ F 1D 1E 1F +2 20 21 22 @@ -176,6 +163,7 @@ F 2D 2E 2F +3 30 31 32 @@ -192,6 +180,7 @@ F 3D 3E 3F +4 40 41 42 @@ -208,6 +197,7 @@ F 4D 4E 4F +5 50 51 52 @@ -223,6 +213,7 @@ F 5D 5E 5F +6 60 61 62 @@ -239,6 +230,7 @@ F 6D 6E 6F +7 70 71 72 @@ -255,6 +247,7 @@ F 7D 7E 7F +8 80 81 82 @@ -271,6 +264,7 @@ F 8D 8E 8F +9 90 91 92 @@ -287,6 +281,7 @@ F 9D 9E 9F +A A0 A1 A2 @@ -303,6 +298,7 @@ AC AD AE AF +B B0 B1 B2 @@ -319,6 +315,7 @@ BC BD BE BF +C C0 C1 C2 @@ -335,6 +332,7 @@ CC CD CE CF +D D0 D1 D2 @@ -351,6 +349,7 @@ DC DD DE DF +E E0 E1 E2 @@ -367,6 +366,7 @@ EC ED EE EF +F F0 F1 F2 @@ -405,20 +405,6 @@ count(*) 31 select hex(a) from t4; hex(a) -2 -3 -4 -5 -6 -7 -8 -9 -A -B -C -D -E -F 10 11 12 @@ -435,5 +421,19 @@ F 1D 1E 1F +2 20 +3 +4 +5 +6 +7 +8 +9 +A +B +C +D +E +F drop table t4; diff --git a/mysql-test/suite/parts/r/partition_bit_myisam.result b/mysql-test/suite/parts/r/partition_bit_myisam.result index ed76c67baa3..d4b81fc74b5 100644 --- a/mysql-test/suite/parts/r/partition_bit_myisam.result +++ b/mysql-test/suite/parts/r/partition_bit_myisam.result @@ -130,20 +130,6 @@ count(*) select hex(a) from t3; hex(a) 1 -2 -3 -4 -5 -6 -7 -8 -9 -A -B -C -D -E -F 10 11 12 @@ -160,6 +146,7 @@ F 1D 1E 1F +2 20 21 22 @@ -176,6 +163,7 @@ F 2D 2E 2F +3 30 31 32 @@ -192,6 +180,7 @@ F 3D 3E 3F +4 40 41 42 @@ -208,6 +197,7 @@ F 4D 4E 4F +5 50 51 52 @@ -223,6 +213,7 @@ F 5D 5E 5F +6 60 61 62 @@ -239,6 +230,7 @@ F 6D 6E 6F +7 70 71 72 @@ -255,6 +247,7 @@ F 7D 7E 7F +8 80 81 82 @@ -271,6 +264,7 @@ F 8D 8E 8F +9 90 91 92 @@ -287,6 +281,7 @@ F 9D 9E 9F +A A0 A1 A2 @@ -303,6 +298,7 @@ AC AD AE AF +B B0 B1 B2 @@ -319,6 +315,7 @@ BC BD BE BF +C C0 C1 C2 @@ -335,6 +332,7 @@ CC CD CE CF +D D0 D1 D2 @@ -351,6 +349,7 @@ DC DD DE DF +E E0 E1 E2 @@ -367,6 +366,7 @@ EC ED EE EF +F F0 F1 F2 @@ -405,20 +405,6 @@ count(*) 31 select hex(a) from t4; hex(a) -2 -3 -4 -5 -6 -7 -8 -9 -A -B -C -D -E -F 10 11 12 @@ -435,5 +421,19 @@ F 1D 1E 1F +2 20 +3 +4 +5 +6 +7 +8 +9 +A +B +C +D +E +F drop table t4; |