summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2017-12-05 17:05:05 +0200
committerMonty <monty@mariadb.org>2017-12-07 10:32:23 +0200
commit3eaca005ff48e84924601ecb92580a7adbaa6cfe (patch)
treef92fea228b5e000c50d63d99995cf76bb6223973 /client
parent51c73a431ffb5fd746819aae12f74f9ab8ed0f90 (diff)
downloadmariadb-git-3eaca005ff48e84924601ecb92580a7adbaa6cfe.tar.gz
Ensure that mysqladmin also works with MariaDB 10.3 + more
Increase the number of status variabels that can be handled
Diffstat (limited to 'client')
-rw-r--r--client/mysqladmin.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
index 45b332a6cd6..7e824cadf40 100644
--- a/client/mysqladmin.cc
+++ b/client/mysqladmin.cc
@@ -34,9 +34,9 @@
char *host= NULL, *user= 0, *opt_password= 0,
*default_charset= (char*) MYSQL_AUTODETECT_CHARSET_NAME;
-char truncated_var_names[MAX_MYSQL_VAR][MAX_TRUNC_LENGTH];
-char ex_var_names[MAX_MYSQL_VAR][FN_REFLEN];
-ulonglong last_values[MAX_MYSQL_VAR];
+char truncated_var_names[MAX_MYSQL_VAR+100][MAX_TRUNC_LENGTH];
+char ex_var_names[MAX_MYSQL_VAR+100][FN_REFLEN];
+ulonglong last_values[MAX_MYSQL_VAR+100];
static int interval=0;
static my_bool option_force=0,interrupted=0,new_line=0,
opt_compress= 0, opt_local= 0, opt_relative= 0, opt_verbose= 0,
@@ -885,7 +885,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
return -1;
}
- DBUG_ASSERT(mysql_num_rows(res) < MAX_MYSQL_VAR);
+ DBUG_ASSERT(mysql_num_rows(res) < MAX_MYSQL_VAR+100);
if (!opt_vertical)
print_header(res);