database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fixed a bug in mysql client.

Browse Source
This commit is contained in:
jani@dsl-jkl1657.dial.inet.fi
2002-05-31 15:43:21 +03:00
parent f587e98506
commit 673f67f6d1
1 changed files with 112 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/mysql.cc
View File

@@ -40,7 +40,7 @@
#include <signal.h> #include <signal.h>
#include <violite.h> #include <violite.h>
const char *VER= "12.9"; const char *VER= "12.10";
/* 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
@@ -645,6 +645,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
case 'A': case 'A':
rehash= 0; rehash= 0;
break; break;
case 'N':
column_names= 0;
break;
case 'e': case 'e':
status.batch= 1; status.batch= 1;
status.add_to_history= 0; status.add_to_history= 0;
@@ -1597,18 +1600,19 @@ print_table_data(MYSQL_RES *result)
tee_puts(separator.c_ptr(), PAGER); tee_puts(separator.c_ptr(), PAGER);
} }
while ((cur = mysql_fetch_row(result))) while ((cur= mysql_fetch_row(result)))
{ {
(void) tee_fputs("|", PAGER); (void) tee_fputs("|", PAGER);
mysql_field_seek(result,0); mysql_field_seek(result, 0);
for (uint off=0 ; off < mysql_num_fields(result); off++) for (uint off= 0; off < mysql_num_fields(result); off++)
{ {
const char *str=cur[off] ? cur[off] : "NULL"; const char *str= cur[off] ? cur[off] : "NULL";
field = mysql_fetch_field(result); field= mysql_fetch_field(result);
uint length=field->max_length; uint length= field->max_length;
if (length > MAX_COLUMN_LENGTH) if (length > MAX_COLUMN_LENGTH)
{ {
tee_fputs(str,PAGER); tee_fputs(" |",PAGER); tee_fputs(str, PAGER);
tee_fputs(" |", PAGER);
} }
else else
tee_fprintf(PAGER, num_flag[off] ? "%*s |" : " %-*s|", tee_fprintf(PAGER, num_flag[off] ? "%*s |" : " %-*s|",