diff options
author | unknown <monty@hundin.mysql.fi> | 2001-10-09 03:35:29 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-10-09 03:35:29 +0300 |
commit | 1c64f355b4e0bb7a709dd850857a9bb41b11d09c (patch) | |
tree | 07f2a0acc005ba2b7fb714ce60cb6f8417c6f60e /client/mysqladmin.c | |
parent | 9417dc5c17bc0c35d04e20e600ce7804ec20e736 (diff) | |
download | mariadb-git-1c64f355b4e0bb7a709dd850857a9bb41b11d09c.tar.gz |
One should not only have to include my_net.h to work with sockets.
This wrapper noew will include all the necessary, system specific files,
which makes all normal source files much easier to write and maintain.
Portability fixes.
Docs/manual.texi:
Updated upgrading from 3.23 -> 4.0
client/mysqladmin.c:
Portability fixes
client/mysqlshow.c:
Portability fixes
extra/resolveip.c:
Portability fixes
include/my_global.h:
Portability fixes
include/my_net.h:
One should not only have to include my_net.h to work with sockets.
This wrapper noew will include all the necessary, system specific files,
which makes all normal source files much easier to write and maintain.
include/mysql_com.h:
Portability fixes
libmysql/net.c:
Portability fixes
libmysqld/lib_vio.c:
Portability fixes
mysql-test/r/drop.result:
Fix crashed tests
mysql-test/r/err000001.result:
Fix crashed tests
mysql-test/r/innodb.result:
Fix crashed tests
mysql-test/r/overflow.result:
Fix crashed tests
sql/net_serv.cc:
Use new my_net.h
vio/vio.c:
Use new my_net.h
vio/viosocket.c:
Use new my_net.h
vio/viossl.c:
Use new my_net.h
Diffstat (limited to 'client/mysqladmin.c')
-rw-r--r-- | client/mysqladmin.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysqladmin.c b/client/mysqladmin.c index 6cc55faf626..7cddcfc8e04 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -928,7 +928,7 @@ static void print_header(MYSQL_RES *result) putchar('|'); while ((field = mysql_fetch_field(result))) { - printf(" %-*s|",field->max_length+1,field->name); + printf(" %-*s|",(int) field->max_length+1,field->name); } putchar('\n'); print_top(result); @@ -983,11 +983,11 @@ static void print_relative_row(MYSQL_RES *result, MYSQL_ROW cur, uint row) mysql_field_seek(result, 0); field = mysql_fetch_field(result); - printf("| %-*s|", field->max_length + 1, cur[0]); + printf("| %-*s|", (int) field->max_length + 1, cur[0]); field = mysql_fetch_field(result); tmp = cur[1] ? strtoull(cur[1], NULL, 0) : (ulonglong) 0; - printf(" %-*s|\n", field->max_length + 1, + printf(" %-*s|\n", (int) field->max_length + 1, llstr((tmp - last_values[row]), buff)); last_values[row] = tmp; } |