Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint (c7815f2a) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/innodb.result

+4 −12

Original line number	Diff line number	Diff line
		@@ -1295,24 +1295,16 @@ insert into t2 (a) select b from t1;
		insert into t1 (a) select b from t2;
		insert into t2 (a) select b from t1;
		insert into t1 (a) select b from t2;
		insert into t2 (a) select b from t1;
		insert into t1 (a) select b from t2;
		insert into t2 (a) select b from t1;
		insert into t1 (a) select b from t2;
		insert into t2 (a) select b from t1;
		insert into t1 (a) select b from t2;
		insert into t2 (a) select b from t1;
		insert into t1 (a) select b from t2;
		select count(*) from t1;
		count(*)
		29267
		623
		explain select * from t1 where c between 1 and 2500;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 range c c 5 NULL # Using where
		update t1 set c=a;
		explain select * from t1 where c between 1 and 2500;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 range c c 5 NULL # Using where
		1 SIMPLE t1 ALL c NULL NULL NULL # Using where
		drop table t1,t2;
		create table t1 (id int primary key auto_increment, fk int, index index_fk (fk)) engine=innodb;
		insert into t1 (id) values (null),(null),(null),(null),(null);
		@@ -1786,10 +1778,10 @@ Variable_name Value
		Innodb_rows_deleted 2070
		show status like "Innodb_rows_inserted";
		Variable_name Value
		Innodb_rows_inserted 31727
		Innodb_rows_inserted 3083
		show status like "Innodb_rows_updated";
		Variable_name Value
		Innodb_rows_updated 29530
		Innodb_rows_updated 886
		show status like "Innodb_row_lock_waits";
		Variable_name Value
		Innodb_row_lock_waits 0

mysql-test/r/partition.result

+4 −4

Original line number	Diff line number	Diff line
		@@ -1083,12 +1083,12 @@ partition by range (a)
		subpartition by hash (a)
		(partition p0 VALUES LESS THAN (1) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx'
		(SUBPARTITION subpart00, SUBPARTITION subpart01));
		hello/master-data/test/t1.frm
		hello/master-data/test/t1.par
		hello/master-data/test/t1#P#p0#SP#subpart00.MYD
		hello/master-data/test/t1#P#p0#SP#subpart00.MYI
		hello/master-data/test/t1#P#p0#SP#subpart01.MYD
		hello/master-data/test/t1#P#p0#SP#subpart01.MYI
		hello/master-data/test/t1.frm
		hello/master-data/test/t1.par
		hello/master-data/tmpdata/t1#P#p0#SP#subpart00.MYD
		hello/master-data/tmpdata/t1#P#p0#SP#subpart01.MYD
		hello/master-data/tmpinx/t1#P#p0#SP#subpart00.MYI
		@@ -1098,6 +1098,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
		(SUBPARTITION subpart10, SUBPARTITION subpart11),
		partition p2 VALUES LESS THAN (2) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx'
		(SUBPARTITION subpart20, SUBPARTITION subpart21));
		hello/master-data/test/t1.frm
		hello/master-data/test/t1.par
		hello/master-data/test/t1#P#p1#SP#subpart10.MYD
		hello/master-data/test/t1#P#p1#SP#subpart10.MYI
		hello/master-data/test/t1#P#p1#SP#subpart11.MYD
		@@ -1106,8 +1108,6 @@ hello/master-data/test/t1#P#p2#SP#subpart20.MYD
		hello/master-data/test/t1#P#p2#SP#subpart20.MYI
		hello/master-data/test/t1#P#p2#SP#subpart21.MYD
		hello/master-data/test/t1#P#p2#SP#subpart21.MYI
		hello/master-data/test/t1.frm
		hello/master-data/test/t1.par
		hello/master-data/tmpdata/t1#P#p1#SP#subpart10.MYD
		hello/master-data/tmpdata/t1#P#p1#SP#subpart11.MYD
		hello/master-data/tmpdata/t1#P#p2#SP#subpart20.MYD

mysql-test/r/partition_mgm.result

+4 −4

Original line number	Diff line number	Diff line
		@@ -7,12 +7,12 @@ t1 CREATE TABLE `t1` (
		`f_date` date DEFAULT NULL,
		`f_varchar` varchar(30) DEFAULT NULL
		) ENGINE=MyISAM DEFAULT CHARSET=latin1 /!50100 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 2 /
		hello/master-data/test/t1.frm
		hello/master-data/test/t1.par
		hello/master-data/test/t1#P#p0.MYD
		hello/master-data/test/t1#P#p0.MYI
		hello/master-data/test/t1#P#p1.MYD
		hello/master-data/test/t1#P#p1.MYI
		hello/master-data/test/t1.frm
		hello/master-data/test/t1.par
		ALTER TABLE t1 COALESCE PARTITION 1;
		SHOW CREATE TABLE t1;
		Table Create Table
		@@ -20,10 +20,10 @@ t1 CREATE TABLE `t1` (
		`f_date` date DEFAULT NULL,
		`f_varchar` varchar(30) DEFAULT NULL
		) ENGINE=MyISAM DEFAULT CHARSET=latin1 /!50100 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 1 /
		hello/master-data/test/t1#P#p0.MYD
		hello/master-data/test/t1#P#p0.MYI
		hello/master-data/test/t1.frm
		hello/master-data/test/t1.par
		hello/master-data/test/t1#P#p0.MYD
		hello/master-data/test/t1#P#p0.MYI
		drop table t1;
		create table t1 (a int)
		partition by list (a)

mysql-test/t/disabled.def

+1 −0

Original line number	Diff line number	Diff line
		@@ -45,3 +45,4 @@ rpl_truncate_7ndb : BUG#21298 2006-07-27 msvensson
		crash_commit_before : 2006-08-02 msvensson
		rpl_ndb_dd_advance : BUG#18679 2006-07-28 jimw (Test fails randomly)
		federated_transactions : Need to be re-enabled once Patrick's merge is complete
		partition : BUG#21658 2006-08-17 azundris fails w/ --ps-protocol

mysql-test/t/innodb.test

+0 −8

Original line number	Diff line number	Diff line
		@@ -904,14 +904,6 @@ insert into t2 (a) select b from t1;
		insert into t1 (a) select b from t2;
		insert into t2 (a) select b from t1;
		insert into t1 (a) select b from t2;
		insert into t2 (a) select b from t1;
		insert into t1 (a) select b from t2;
		insert into t2 (a) select b from t1;
		insert into t1 (a) select b from t2;
		insert into t2 (a) select b from t1;
		insert into t1 (a) select b from t2;
		insert into t2 (a) select b from t1;
		insert into t1 (a) select b from t2;
		select count(*) from t1;
		--replace_column 9 #
		explain select * from t1 where c between 1 and 2500;