Commit 548d45a2 authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged
parents b8930cbc c7815f2a

mysql-test/lib/mtr_process.pl

+4 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ sub mtr_check_stop_servers ($) { 
      }

      else

      {

	mtr_verbose("All ports where free, continuing");

	mtr_verbose("All ports were free, continuing");

      }

    }

  }
@@ -896,6 +896,7 @@ sub check_expected_crash_and_restart($) 


sub mtr_record_dead_children () {



  my $process_died= 0;

  my $ret_pid;



  # Wait without blockinng to see if any processes had died
@@ -904,7 +905,9 @@ sub mtr_record_dead_children () { 
  {

    mtr_warning("mtr_record_dead_children: $ret_pid");

    mark_process_dead($ret_pid);

    $process_died= 1;

  }

  return $process_died;

}



sub start_reap_all {

mysql-test/mysql-test-run.pl

+317 −219

File changed.

Preview size limit exceeded, changes collapsed.

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

File changed.

Preview size limit exceeded, changes collapsed.

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)