1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


client/mysql.cc:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
This commit is contained in:
unknown
2006-08-04 19:19:26 +02:00
79 changed files with 1323 additions and 222 deletions

View File

@@ -2859,7 +2859,7 @@ com_connect(String *buffer, char *line)
bzero(buff, sizeof(buff));
if (buffer)
{
strmov(buff, line);
strmake(buff, line, sizeof(buff));
tmp= get_arg(buff, 0);
if (tmp && *tmp)
{
@@ -3727,6 +3727,9 @@ static const char* construct_prompt()
case 't':
processed_prompt.append('\t');
break;
case 'l':
processed_prompt.append(delimiter_str);
break;
default:
processed_prompt.append(c);
}