Commit 78dca2de authored by jani@hynda.mysql.fi's avatar jani@hynda.mysql.fi
Browse files

Fixed too bugs in MySQL client 'mysql', interactive command 'tee'.

parent b0f98a30

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ paul@central.snake.net 
sasha@mysql.sashanet.com

serg@serg.mysql.com

heikki@hundin.mysql.fi

jani@hynda.mysql.fi

client/mysql.cc

+14 −8
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "my_readline.h"

#include <signal.h>



const char *VER="11.16";

const char *VER="11.17";



/* Don't try to make a nice table if the data is too big */

#define MAX_COLUMN_LENGTH	     1024
@@ -1776,10 +1776,17 @@ com_tee(String *buffer, char *line __attribute__((unused))) 
  {

    while (isspace(*param))

      param++;

    end=strmake(file_name, param, sizeof(file_name)-1);

    end= strend(param);

    while (end > file_name && (isspace(end[-1]) || iscntrl(end[-1])))

      end--;

    end[0]= 0;

    if ((*(end - 1) == '"' && *param == '"') ||

	(*(end - 1) == '\'' && *param == '\''))

    {

      *--end= 0;

      param++;

    }

    strmake(file_name, param, sizeof(file_name) - 1);

    strmov(outfile, file_name);

  }

  if (!strlen(outfile))
@@ -1787,11 +1794,10 @@ com_tee(String *buffer, char *line __attribute__((unused))) 
    printf("No outfile specified!\n");

    return 0;

  }

  if (!opt_outfile)

  {

  if (opt_outfile)

    end_tee();

  init_tee();

  opt_outfile= 1;

  }

  tee_fprintf(stdout, "Logging to file '%s'\n", outfile);

  return 0;

}