1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
This commit is contained in:
bell@sanja.is.com.ua 2003-11-20 14:42:40 +02:00
commit da73d77f6f
1 changed files with 67 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/mysql.cc
View File

@ -44,7 +44,7 @@
#include <locale.h> #include <locale.h>
#endif #endif
const char *VER= "14.2"; const char *VER= "14.3";
/* 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
@ -1665,10 +1665,11 @@ com_go(String *buffer,char *line __attribute__((unused)))
buffer->length(0); // Remove query on error buffer->length(0); // Remove query on error
return error; return error;
} }
error=0; error=0;
buffer->length(0); buffer->length(0);
do
{
if (quick) if (quick)
{ {
if (!(result=mysql_use_result(&mysql)) && mysql_field_count(&mysql)) if (!(result=mysql_use_result(&mysql)) && mysql_field_count(&mysql))
@ -1738,6 +1739,8 @@ com_go(String *buffer,char *line __attribute__((unused)))
else if (unbuffered) else if (unbuffered)
fflush(stdout); fflush(stdout);
mysql_free_result(result); mysql_free_result(result);
} while (!mysql_next_result(&mysql));
return error; /* New command follows */ return error; /* New command follows */
} }
@ -2416,6 +2419,7 @@ com_delimiter(String *buffer __attribute__((unused)), char *line)
} }
strmake(delimiter, tmp, sizeof(delimiter) - 1); strmake(delimiter, tmp, sizeof(delimiter) - 1);
delimiter_length= strlen(delimiter); delimiter_length= strlen(delimiter);
delimiter_str= delimiter;
return 0; return 0;
} }