1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@neptunus.(none) 2006-11-03 16:18:32 +01:00
commit 63091e074a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
myisam/sort.c
View File

@ -323,7 +323,6 @@ pthread_handler_t thr_find_all_keys(void *arg)
if (my_thread_init()) if (my_thread_init())
goto err; goto err;
{ /* Add extra block since DBUG_ENTER declare variables */ { /* Add extra block since DBUG_ENTER declare variables */
DBUG_ENTER("thr_find_all_keys"); DBUG_ENTER("thr_find_all_keys");
DBUG_PRINT("enter", ("master: %d", sort_param->master)); DBUG_PRINT("enter", ("master: %d", sort_param->master));

4
mysql-test/lib/mtr_process.pl
View File

@ -441,7 +441,6 @@ sub mtr_kill_leftovers () {
# Only read pid from files that end with .pid # Only read pid from files that end with .pid
if ( $elem =~ /.*[.]pid$/) if ( $elem =~ /.*[.]pid$/)
{ {
my $pidfile= "$rundir/$elem"; my $pidfile= "$rundir/$elem";
if ( -f $pidfile ) if ( -f $pidfile )
@ -465,7 +464,8 @@ sub mtr_kill_leftovers () {
} }
else else
{ {
mtr_warning("Found non pid file $elem in $rundir"); mtr_warning("Found non pid file $elem in $rundir")
if -f "$rundir/$elem";
next; next;
} }
} }

2
mysql-test/t/innodb_mysql.test
View File

@ -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); SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = 1 AND `id3` = 2);
DROP TABLE t1, t2; DROP TABLE t1, t2;
#
# Bug #22728 - Handler_rollback value is growing # Bug #22728 - Handler_rollback value is growing
# #