Commit 34db50d9 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
parents 1013c2fa fe3d5732

client/mysqltest.c

+4 −4
Original line number Diff line number Diff line
@@ -2180,9 +2180,10 @@ int do_connect(struct st_query *q) 
  int free_con_sock= 0;

  int error= 0;

  int create_conn= 1;

  VAR *var_port, *var_sock;



  DBUG_ENTER("do_connect");

  DBUG_PRINT("enter",("connect: %s",p));

  DBUG_PRINT("enter",("connect: %s", q->first_argument));



  /* Make a copy of query before parsing, safe_get_param will modify */

  if (!(con_buf= my_strdup(q->first_argument, MYF(MY_WME))))
@@ -2199,7 +2200,6 @@ int do_connect(struct st_query *q) 
  p= safe_get_param(p, &con_db, "Missing connection db");



  /* Port */

  VAR* var_port;

  p= safe_get_param(p, &con_port_str, 0);

  if (*con_port_str)

  {
@@ -2222,7 +2222,6 @@ int do_connect(struct st_query *q) 
  }



  /* Sock */

  VAR *var_sock;

  p= safe_get_param(p, &con_sock, 0);

  if (*con_sock)

  {
@@ -2258,7 +2257,8 @@ int do_connect(struct st_query *q) 
      die("Illegal option to connect: %s", con_options);

    con_options= str;

  }

  q->last_argument= p;

  /* Note: 'p' is pointing into the copy 'con_buf' */

  q->last_argument= q->first_argument + (p - con_buf);



  if (next_con == cons_end)

    die("Connection limit exhausted - increase MAX_CONS in mysqltest.c");

mysql-test/mysql-test-run.pl

+5 −0
Original line number Diff line number Diff line
@@ -481,6 +481,9 @@ sub command_line_setup () { 
    $opt_master_myport=   $ENV{'MTR_BUILD_THREAD'} * 40 + 8120;

    $opt_slave_myport=    $opt_master_myport + 16;

    $opt_ndbcluster_port= $opt_master_myport + 24;

    $im_port=             $opt_master_myport + 10;

    $im_mysqld1_port=     $opt_master_myport + 12;

    $im_mysqld2_port=     $opt_master_myport + 14;

  }



  # Read the command line
@@ -1070,6 +1073,8 @@ sub environment_setup () { 
  print "Using MASTER_MYPORT1   = $ENV{MASTER_MYPORT1}\n";

  print "Using SLAVE_MYPORT     = $ENV{SLAVE_MYPORT}\n";

  print "Using NDBCLUSTER_PORT  = $opt_ndbcluster_port\n";

  print "Using IM_MYSQLD1_PORT  = $ENV{'IM_MYSQLD1_PORT'}\n";

  print "Using IM_MYSQLD2_PORT  = $ENV{'IM_MYSQLD2_PORT'}\n";

}