diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-09 17:09:21 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-09 17:09:21 -0400 |
| commit | e11cad9e9dd3ae0be61aec1bb50b0ddc867b10be (patch) | |
| tree | d1266ef4e52851e73467a6d7bf4a3ca991b484fa /client/mysqladmin.cc | |
| parent | 99f496ae65a56d587e24c88df85aae7e7cfce70e (diff) | |
| parent | 0880284bf715b4916cc735e19b76d1062c2bfdcf (diff) | |
| download | mariadb-git-e11cad9e9dd3ae0be61aec1bb50b0ddc867b10be.tar.gz | |
Merge tag 'mariadb-10.0.19' into 10.0-galera
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 88016d9563d..bc6b68c63d1 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2010, 2014, Monty Program Ab. + Copyright (c) 2010, 2015, MariaDB 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 @@ -1249,6 +1249,9 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) static char **mask_password(int argc, char ***argv) { char **temp_argv; + if (!argc) + return NULL; + temp_argv= (char **)(my_malloc(sizeof(char *) * argc, MYF(MY_WME))); argc--; while (argc > 0) |