diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-01 15:51:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-01 15:51:25 +0200 |
| commit | 5091a4ba755250ed8e35f4f5a39a118d476cd8f1 (patch) | |
| tree | 370ba468d78204544b56e9d967d8d09e1317a1ed /client/mysqladmin.cc | |
| parent | 84eaf0911f311acba797c265ef7508ab6c108b35 (diff) | |
| parent | 0880284bf715b4916cc735e19b76d1062c2bfdcf (diff) | |
| download | mariadb-git-5091a4ba755250ed8e35f4f5a39a118d476cd8f1.tar.gz | |
Merge tag 'mariadb-10.0.19' into 10.1
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 ee3ab7f0864..0089e03ac93 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 @@ -1246,6 +1246,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) |