Commit 4c503b8d authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/my50-m-stress 

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

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -1511,7 +1511,7 @@ void do_exec(struct st_command *command) 
  do_eval(&ds_cmd, cmd, command->end, TRUE);



  DBUG_PRINT("info", ("Executing '%s' as '%s'",

                      command->first_argument, cmd));

                      command->first_argument, ds_cmd.str));



  if (!(res_file= my_popen(&ds_cmd, "r")) && command->abort_on_error)

    die("popen(\"%s\", \"r\") failed", command->first_argument);

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/r/mysql.result

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errn 
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)

The commands reported in the bug report

ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)

ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)

Too long dbname

ERROR 1049 (42000) at line 1: Unknown database 'test_really_long_dbnamexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'

Too long hostname

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

#