database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

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

Browse Source 
client/mysql.cc:
  Fixed two bugs in 'tee'.
  It's now possible to change the 'tee-file' on the fly without
  need to run 'notee' in between. 'tee' will now also accept quotes
  around the file name.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown
2002-02-15 02:34:48 +02:00
parent 4c16462118
commit a95fba4d22
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@@ -12,3 +12,4 @@ paul@central.snake.net
sasha@mysql.sashanet.com sasha@mysql.sashanet.com
serg@serg.mysql.com serg@serg.mysql.com
heikki@hundin.mysql.fi heikki@hundin.mysql.fi
jani@hynda.mysql.fi

22
client/mysql.cc
View File

@@ -34,7 +34,7 @@
#include "my_readline.h" #include "my_readline.h"
#include <signal.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 */ /* Don't try to make a nice table if the data is too big */
#define MAX_COLUMN_LENGTH 1024 #define MAX_COLUMN_LENGTH 1024
@@ -1776,10 +1776,17 @@ com_tee(String *buffer, char *line __attribute__((unused)))
{ {
while (isspace(*param)) while (isspace(*param))
param++; param++;
end=strmake(file_name, param, sizeof(file_name)-1); end= strend(param);
while (end > file_name && (isspace(end[-1]) || iscntrl(end[-1]))) while (end > file_name && (isspace(end[-1]) || iscntrl(end[-1])))
end--; end--;
end[0]=0; 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); strmov(outfile, file_name);
} }
if (!strlen(outfile)) if (!strlen(outfile))
@@ -1787,11 +1794,10 @@ com_tee(String *buffer, char *line __attribute__((unused)))
printf("No outfile specified!\n"); printf("No outfile specified!\n");
return 0; return 0;
} }
if (!opt_outfile) if (opt_outfile)
{ end_tee();
init_tee(); init_tee();
opt_outfile=1; opt_outfile= 1;
}
tee_fprintf(stdout, "Logging to file '%s'\n", outfile); tee_fprintf(stdout, "Logging to file '%s'\n", outfile);
return 0; return 0;
} }