List:Commits« Previous MessageNext Message »
From:Ole John Aske Date:January 27 2012 11:20am
Subject:bzr push into mysql-trunk branch (ole.john.aske:3797 to 3798) Bug#13330645
View as plain text  
 3798 Ole John Aske	2012-01-27
      Followup fix for bug#13330645.
      
      As we now don't request HA_MRR_SORTED when there are no sort requirements, we have
      to add some '--sorted_result' to the tests in order to get the expected row order
      in the results.

    modified:
      mysql-test/suite/parts/inc/partition-dml-1-7.inc
      mysql-test/suite/parts/inc/partition-dml-1-8.inc
      mysql-test/suite/parts/inc/partition_key_16col.inc
      mysql-test/suite/parts/inc/partition_key_32col.inc
      mysql-test/suite/parts/inc/partition_key_4col.inc
      mysql-test/suite/parts/inc/partition_key_8col.inc
      mysql-test/suite/parts/r/partition_special_myisam.result
 3797 Guilhem Bichot	2012-01-27
      Now that pb2 has a daily run with non-default innodb page size,
      we get test failures because page size influences cost 
      and thus influences the trace. Solution: disable the failing
      test if page size is non-default.

    modified:
      mysql-test/suite/opt_trace/include/range.inc
=== modified file 'mysql-test/suite/parts/inc/partition-dml-1-7.inc'
--- a/mysql-test/suite/parts/inc/partition-dml-1-7.inc	2011-02-17 15:36:05 +0000
+++ b/mysql-test/suite/parts/inc/partition-dml-1-7.inc	2012-01-27 11:20:26 +0000
@@ -27,6 +27,7 @@ GRANT ALL PRIVILEGES ON test.* TO test_u
 GRANT ALL PRIVILEGES ON test.* TO test_user_3 IDENTIFIED BY 'testpw';
 
 connect (session1, localhost, test_user_1,'testpw',test);
+--sorted_result
 SELECT * FROM t1 PARTITION (`p0-29`) WHERE a BETWEEN 0 AND 9 LOCK IN SHARE MODE;
 UPDATE t1 PARTITION (`p0-29`) SET b='p0-29-upd-1' WHERE a BETWEEN 0 AND 9 ;
 
@@ -48,6 +49,7 @@ connection session2;
 --echo ####### expect p0-29 has not been updated
 --sorted_result
 SELECT * FROM t1 PARTITION (`p0-29`);
+--sorted_result
 SELECT * FROM t1 PARTITION (`p0-29`) WHERE a BETWEEN 20 AND 29 FOR UPDATE;
 UPDATE t1 PARTITION (`p0-29`) SET b='p0-29-upd-2' WHERE a BETWEEN 20 AND 29 ;
 

=== modified file 'mysql-test/suite/parts/inc/partition-dml-1-8.inc'
--- a/mysql-test/suite/parts/inc/partition-dml-1-8.inc	2011-02-17 15:36:05 +0000
+++ b/mysql-test/suite/parts/inc/partition-dml-1-8.inc	2012-01-27 11:20:26 +0000
@@ -26,6 +26,7 @@ GRANT ALL PRIVILEGES ON test.* TO test_u
 GRANT ALL PRIVILEGES ON test.* TO test_user_3 IDENTIFIED BY 'testpw';
 
 connect (session1, localhost, test_user_1,'testpw',test);
+--sorted_result
 SELECT * FROM t1 PARTITION (`p0-29`) WHERE a BETWEEN 0 AND 9 LOCK IN SHARE MODE;
 UPDATE t1 PARTITION (`p0-29`) SET b='p0-29-upd-1' WHERE a BETWEEN 0 AND 9 ;
 

=== modified file 'mysql-test/suite/parts/inc/partition_key_16col.inc'
--- a/mysql-test/suite/parts/inc/partition_key_16col.inc	2008-02-06 14:13:56 +0000
+++ b/mysql-test/suite/parts/inc/partition_key_16col.inc	2012-01-27 11:20:26 +0000
@@ -11,5 +11,6 @@ insert into t1 values 
 ('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'),
 ('2000-06-15', 'jukg','zikhuk','m', 45675, 6465754.13, 435242623462, 18, '2000-06-15', 'jukg','zikhuk','m', 45675, 6465754.13, 435242623462, 18, 'pib mdotkbm.m');
 select * from t1;
+--sorted_result
 select * from t1 where a<19851231;
 drop table t1;

=== modified file 'mysql-test/suite/parts/inc/partition_key_32col.inc'
--- a/mysql-test/suite/parts/inc/partition_key_32col.inc	2009-09-15 15:07:52 +0000
+++ b/mysql-test/suite/parts/inc/partition_key_32col.inc	2012-01-27 11:20:26 +0000
@@ -21,6 +21,7 @@ insert into t1 values 
 ('1980-10-14', 'fgbbd', 'dtzndtz', 'w', 67856, 5463354.67, 3567845333, 124, '1980-10-14', 'fgbbd', 'dtzndtz', 'w', 67856, 5463354.67, 3567845333, 124, '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'),
 ('2000-06-15', 'jukg','zikhuk','m', 45675, 6465754.13, 435242623462, 18, '2000-06-15', 'jukg','zikhuk','m', 45675, 6465754.13, 435242623462, 18, '2000-06-15', 'jukg','zikhuk','m', 45675, 6465754.13, 435242623462, 18, '2000-06-15', 'jukg','zikhuk','m', 45675, 6465754.13, 435242623462, 18, 'pib mdotkbm.m');
 select * from t1;
+--sorted_result
 select * from t1 where a<19851231;
 drop table t1;
 --enable_abort_on_error

=== modified file 'mysql-test/suite/parts/inc/partition_key_4col.inc'
--- a/mysql-test/suite/parts/inc/partition_key_4col.inc	2008-02-06 14:13:56 +0000
+++ b/mysql-test/suite/parts/inc/partition_key_4col.inc	2012-01-27 11:20:26 +0000
@@ -11,6 +11,7 @@ insert into t1 values 
 ('1980-10-14', 'fgbbd', 'dtzndtz', 'w'),
 ('2000-06-15', 'jukg','zikhuk','m');
 select * from t1;
+--sorted_result
 select * from t1 where a<19851231;
 drop table t1;
 

=== modified file 'mysql-test/suite/parts/inc/partition_key_8col.inc'
--- a/mysql-test/suite/parts/inc/partition_key_8col.inc	2008-02-06 14:13:56 +0000
+++ b/mysql-test/suite/parts/inc/partition_key_8col.inc	2012-01-27 11:20:26 +0000
@@ -11,5 +11,6 @@ insert into t1 values 
 ('1980-10-14', 'fgbbd', 'dtzndtz', 'w', 67856, 5463354.67, 3567845333, 124, 'd,f söierugsig msireg siug ei5ggth lrutluitgzeöjrtnb.rkjthuekuhzrkuthgjdnffjmbr'),
 ('2000-06-15', 'jukg','zikhuk','m', 45675, 6465754.13, 435242623462, 18, 'pib mdotkbm.m' );
 select * from t1;
+--sorted_result
 select * from t1 where a<19851231;
 drop table t1;

=== modified file 'mysql-test/suite/parts/r/partition_special_myisam.result'
--- a/mysql-test/suite/parts/r/partition_special_myisam.result	2011-03-24 13:10:37 +0000
+++ b/mysql-test/suite/parts/r/partition_special_myisam.result	2012-01-27 11:20:26 +0000
@@ -31,9 +31,9 @@ a	b	c	d
 2000-06-15	jukg	zikhuk	m
 select * from t1 where a<19851231;
 a	b	c	d
-1983-12-31	cdef	srtbvsr	w
-1980-10-14	fgbbd	dtzndtz	w
 1975-01-01	abcde	abcde	m
+1980-10-14	fgbbd	dtzndtz	w
+1983-12-31	cdef	srtbvsr	w
 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, i char(255), primary key(a,b,c,d,e,f,g,h)) engine='MyISAM' 
 partition by key(a,b,c,d,e,f,g,h) (

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (ole.john.aske:3797 to 3798) Bug#13330645Ole John Aske30 Jan