diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-01 15:24:50 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-01 15:24:50 +0300 |
| commit | 62a20f8047f074fb65b20dc0c53f5a9c7b1edd4f (patch) | |
| tree | a5aaf21ef6879a8f58815600cf13f55cc369dcde /client/mysql.cc | |
| parent | ba3354fca61fa0ee6c3dc614e7ef1be79a4038ef (diff) | |
| parent | b546913ba2f17be8cc2c0d009c09082663edd703 (diff) | |
| download | mariadb-git-62a20f8047f074fb65b20dc0c53f5a9c7b1edd4f.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index db0780cba74..6e8089ea20b 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2018, Oracle and/or its affiliates. - Copyright (c) 2009, 2021, MariaDB Corporation. + Copyright (c) 2009, 2022, MariaDB Corporation. 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 @@ -3666,7 +3666,6 @@ print_table_data(MYSQL_RES *result) { String separator(256); MYSQL_ROW cur; - MYSQL_FIELD *field; bool *num_flag; num_flag=(bool*) my_alloca(sizeof(bool)*mysql_num_fields(result)); @@ -3678,7 +3677,7 @@ print_table_data(MYSQL_RES *result) mysql_field_seek(result,0); } separator.copy("+",1,charset_info); - while ((field = mysql_fetch_field(result))) + while (MYSQL_FIELD *field= mysql_fetch_field(result)) { uint length= column_names ? field->name_length : 0; if (quick) @@ -3700,7 +3699,7 @@ print_table_data(MYSQL_RES *result) { mysql_field_seek(result,0); (void) tee_fputs("|", PAGER); - for (uint off=0; (field = mysql_fetch_field(result)) ; off++) + while (MYSQL_FIELD *field= mysql_fetch_field(result)) { size_t name_length= (uint) strlen(field->name); size_t numcells= charset_info->numcells(field->name, @@ -3742,7 +3741,7 @@ print_table_data(MYSQL_RES *result) data_length= (uint) lengths[off]; } - field= mysql_fetch_field(result); + MYSQL_FIELD *field= mysql_fetch_field(result); field_max_length= field->max_length; /* |