diff options
| author | msvensson@neptunus.(none) <> | 2006-11-03 16:18:32 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-11-03 16:18:32 +0100 |
| commit | 63091e074a3c8c05a9cad4b76a00b49617b2e2f6 (patch) | |
| tree | cbbc8d709b599f9a55a7e317ed058d088744a101 | |
| parent | 78af4ae44ce30f3ac9306ee9568cd054894bba7d (diff) | |
| parent | 570f603988f932597e3258a42e4b5cc2b208abd1 (diff) | |
| download | mariadb-git-63091e074a3c8c05a9cad4b76a00b49617b2e2f6.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| -rw-r--r-- | myisam/sort.c | 1 | ||||
| -rw-r--r-- | mysql-test/lib/mtr_process.pl | 4 | ||||
| -rw-r--r-- | mysql-test/t/innodb_mysql.test | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index 35a4f15b23c..eebef888e4a 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -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)); diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 048c336f8a3..9d0c1f601ba 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -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; } } diff --git a/mysql-test/t/innodb_mysql.test b/mysql-test/t/innodb_mysql.test index e1f20e7113d..06cfe71ef11 100644 --- a/mysql-test/t/innodb_mysql.test +++ b/mysql-test/t/innodb_mysql.test @@ -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 # |