diff options
| author | Alexey Botchkov <holyfoot@mysql.com> | 2009-11-17 15:27:40 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@mysql.com> | 2009-11-17 15:27:40 +0400 |
| commit | 12043816fa127d4e80801bc4743f4c6bdc5b6364 (patch) | |
| tree | 6b7a74d4ca5d8a84274ea7033d217f86ce4737a8 /client/mysql_upgrade.c | |
| parent | f4000a67e92ea4f2501f51aa3d51afed0a7d9bfa (diff) | |
| parent | de7619823d3846fa514d7f540a7e5af898b142a8 (diff) | |
| download | mariadb-git-12043816fa127d4e80801bc4743f4c6bdc5b6364.tar.gz | |
merging.
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 05eb80e5455..1a3f61559d6 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -819,7 +819,8 @@ int main(int argc, char **argv) init_dynamic_string(&conn_args, "", 512, 256)) die("Out of memory"); - load_defaults("my", load_default_groups, &argc, &argv); + if (load_defaults("my", load_default_groups, &argc, &argv)) + die(NULL); defaults_argv= argv; /* Must be freed by 'free_defaults' */ if (handle_options(&argc, &argv, my_long_options, get_one_option)) |