Commit 62150851 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysys/my_lock.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  Manual merge
myisam/sort.c:
  Manual merge(double checked)
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge
mysys/mf_iocache.c:
  Manual merge
parents 52f70ab8 16a671c0

myisam/sort.c

+0 −1
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ pthread_handler_t thr_find_all_keys(void *arg) 
  if (my_thread_init())

    goto err;





  { /* Add extra block since DBUG_ENTER declare variables */

    DBUG_ENTER("thr_find_all_keys");

    DBUG_PRINT("enter", ("master: %d", sort_param->master));

mysql-test/lib/mtr_process.pl

+2 −2
Original line number Diff line number Diff line
@@ -441,7 +441,6 @@ sub mtr_kill_leftovers () { 
      # Only read pid from files that end with .pid

      if ( $elem =~ /.*[.]pid$/)

      {



	my $pidfile= "$rundir/$elem";



	if ( -f $pidfile )
@@ -465,7 +464,8 @@ sub mtr_kill_leftovers () { 
      }

      else

      {

	mtr_warning("Found non pid file $elem in $rundir");

	mtr_warning("Found non pid file $elem in $rundir")

	  if -f "$rundir/$elem";

	next;

      }

    }

mysql-test/t/innodb_mysql.test

+2 −0
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@ INSERT INTO `t2`(`id1`,`id2`,`id3`,`id4`) VALUES 


SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = 1 AND `id3` = 2);

DROP TABLE t1, t2;



#

# Bug #22728 - Handler_rollback value is growing

#