Commit 0b0ad8ed authored by arjen@co3064164-a.bitbike.com's avatar arjen@co3064164-a.bitbike.com
Browse files

Merge arjen@work.mysql.com:/home/bk/mysql-4.0 

into co3064164-a.bitbike.com:c:/home/mysql-4.0
parents 8fef142c e6c2f145

Docs/manual.texi

+1 −1
Original line number Diff line number Diff line
@@ -33527,7 +33527,7 @@ The different table types are: 
@item ISAM @tab The original table handler. @xref{ISAM}.

@item InnoDB @tab Transaction-safe tables with row locking. @xref{InnoDB}.

@item MERGE @tab A collection of MyISAM tables used as one table. @xref{MERGE}.

@item MRG_MERGE @tab An alias for MERGE tables

@item MRG_MyISAM @tab An alias for MERGE tables

@item MyISAM @tab The new binary portable table handler that is replacing ISAM. @xref{MyISAM}.

@end multitable

@xref{Table types}.

client/mysqltest.c

+25 −4
Original line number Diff line number Diff line
@@ -1280,6 +1280,7 @@ int do_connect(struct st_query* q) 
  char buff[FN_REFLEN];

  int con_port;

  int con_error;

  int free_con_sock = 0;

  

  DBUG_ENTER("do_connect");

  DBUG_PRINT("enter",("connect: %s",p));
@@ -1299,10 +1300,29 @@ int do_connect(struct st_query* q) 
  }

  else

  {

    VAR* var_port, *var_sock;

    p = safe_get_param(p, &con_port_str, "missing connection port");

    if (*con_port_str == '$')

    {

      if (!(var_port = var_get(con_port_str, 0, 0)))

	die("Unknown variable '%s'", con_port_str+1);

      con_port = var_port->int_val;

    }

    else

     con_port=atoi(con_port_str);

    p = safe_get_param(p, &con_sock, "missing connection socket");

    if (*con_sock == '$')

    {

      if (!(var_sock = var_get(con_sock, 0, 0)))

	die("Unknown variable '%s'", con_sock+1);

      if (!(con_sock = (char*)my_malloc(var_sock->str_val_len+1, MYF(0))))

	die("Out of memory");

      free_con_sock = 1;

      memcpy(con_sock, var_sock->str_val, var_sock->str_val_len);

      con_sock[var_sock->str_val_len] = 0;

    }

  }

  

  if (next_con == cons_end)

    die("Connection limit exhausted - increase MAX_CONS in mysqltest.c");
@@ -1310,20 +1330,21 @@ int do_connect(struct st_query* q) 
    die("Failed on mysql_init()");

  if (opt_compress)

    mysql_options(&next_con->mysql,MYSQL_OPT_COMPRESS,NullS);

  if (con_sock)

  if (con_sock && !free_con_sock && *con_sock && *con_sock != FN_LIBCHAR)

    con_sock=fn_format(buff, con_sock, TMPDIR, "",0);

  if (!con_db[0])

    con_db=db;

  if((con_error = safe_connect(&next_con->mysql, con_host,

			    con_user, con_pass,

			    con_db, con_port, con_sock)))

			    con_db, con_port, *con_sock ? con_sock: 0)))

    die("Could not open connection '%s': %s", con_name,

	mysql_error(&next_con->mysql));



  if (!(next_con->name = my_strdup(con_name, MYF(MY_WME))))

    die(NullS);

  cur_con = next_con++;



  if (free_con_sock)

    my_free(con_sock, MYF(MY_WME));

  DBUG_RETURN(0);

}

myisam/ft_parser.c

+2 −2
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ byte ft_get_word(byte **start, byte *end, FT_WORD *word, FTB_PARAM *param) 
    if ((param->trunc=(doc<end && *doc == FTB_TRUNC)))

      doc++;



    if (word->len >= ft_min_word_len && word->len < ft_max_word_len &&

        !is_stopword(word->pos, word->len))

    if (((word->len >= ft_min_word_len && !is_stopword(word->pos, word->len))

         || param->trunc) && word->len < ft_max_word_len)

    {

      *start=doc;

      return 1;

mysql-test/include/master-slave.inc

+4 −4
Original line number Diff line number Diff line 
connect (master,localhost,root,,test,0,master.sock);

connect (master1,localhost,root,,test,0,master.sock);

connect (slave,localhost,root,,test,0,slave.sock);

connect (slave1,localhost,root,,test,0,slave.sock);

connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);

connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);

connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);

connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);

connection slave;

--error 0,1199

!slave stop;

mysql-test/mysql-test-run.sh

+8 −1
Original line number Diff line number Diff line
@@ -151,6 +151,11 @@ while test $# -gt 0; do 
    --verbose-manager)  MANAGER_QUIET_OPT="" ;;

    --local)   USE_RUNNING_SERVER="" ;;

    --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;;

    --local-master)

      MASTER_MYPORT=3306;

      EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT --host=127.0.0.1 \

      --port=$MYSQL_MYPORT"

      LOCAL_MASTER=1 ;;

    --master_port=*) MASTER_MYPORT=`$ECHO "$1" | $SED -e "s;--master_port=;;"` ;;

    --slave_port=*) SLAVE_MYPORT=`$ECHO "$1" | $SED -e "s;--slave_port=;;"` ;;

    --manager-port=*) MYSQL_MANAGER_PORT=`$ECHO "$1" | $SED -e "s;--manager_port=;;"` ;;
@@ -639,7 +644,9 @@ EOF 


start_master()

{

    [ x$MASTER_RUNNING = 1 ] && return

    if [ x$MASTER_RUNNING = x1 ] || [ x$LOCAL_MASTER = x1 ] ; then

      return

    fi

    # Remove old berkeley db log files that can confuse the server

    $RM -f $MASTER_MYDDIR/log.*

    # Remove stale binary logs