diff options
Diffstat (limited to 'client/mysqladmin.c')
| -rw-r--r-- | client/mysqladmin.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/client/mysqladmin.c b/client/mysqladmin.c index 0dd8cfb1bd0..f6ebffea087 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -1,15 +1,15 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - +/* Copyright (C) 2000 MySQL AB + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -265,7 +265,7 @@ int main(int argc,char *argv[]) #ifdef HAVE_OPENSSL if (opt_use_ssl) mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, - opt_ssl_capath); + opt_ssl_capath, opt_ssl_cipher); #endif /* HAVE_OPENSSL */ if (sql_connect(&mysql,host,user,opt_password,option_wait)) error = 1; @@ -337,7 +337,7 @@ static my_bool sql_connect(MYSQL *mysql,const char *host, const char *user, } return 0; } - + if (!wait) { if (!option_silent) @@ -649,7 +649,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) } else print_top(res); - + ex_status_printed = 1; /* From now on the output will be relative */ mysql_free_result(res); break; @@ -745,7 +745,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) else puts("Slave stopped"); break; - + case ADMIN_PING: mysql->reconnect=0; /* We want to know of reconnects */ if (!mysql_ping(mysql)) @@ -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; } @@ -1000,7 +1000,7 @@ static void print_relative_row_vert(MYSQL_RES *result __attribute__((unused)), uint length; ulonglong tmp; char buff[22]; - + if (!row) putchar('|'); @@ -1079,7 +1079,7 @@ static void truncate_names() *ptr++='+'; *ptr=0; puts(top_line); - + for (i = 0 ; i < ex_var_count; i++) { uint sfx=1,j; |