diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-17 21:42:57 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-17 21:42:57 +0100 |
| commit | a4b271496888e1f8628d0af36309e35293093577 (patch) | |
| tree | 852ea8d9e627728d260bec20602d3aea94e2e156 /client | |
| parent | 09b586546029a7ffc6886b0ab528105ef3fb78eb (diff) | |
| parent | 3eb8b1125f0c4d9373273cc98d7197cf7f5c2ef1 (diff) | |
| download | mariadb-git-a4b271496888e1f8628d0af36309e35293093577.tar.gz | |
Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_upgrade.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 26682ce8c87..b84caa541c1 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -184,7 +184,8 @@ static const char *load_default_groups[]= static void free_used_memory(void) { /* Free memory allocated by 'load_defaults' */ - free_defaults(defaults_argv); + if (defaults_argv) + free_defaults(defaults_argv); dynstr_free(&ds_args); dynstr_free(&conn_args); @@ -1096,7 +1097,6 @@ int main(int argc, char **argv) if (opt_systables_only && !opt_silent) printf("The --upgrade-system-tables option was used, user tables won't be touched.\n"); - /* Read the mysql_upgrade_info file to check if mysql_upgrade already has been run for this installation of MySQL |