mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
unknown 2006-11-03 16:18:32 +01:00
commit 6215085143
3 changed files with 4 additions and 3 deletions
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())
goto err;
{ /* Add extra block since DBUG_ENTER declare variables */
DBUG_ENTER("thr_find_all_keys");
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
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;
}
}

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);
DROP TABLE t1, t2;
#
# Bug #22728 - Handler_rollback value is growing
#