diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-17 11:00:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-17 11:00:51 +0100 |
| commit | 84651126c0f101ea762eec0eb4045f533a00e96d (patch) | |
| tree | 1bba1d0079b08cb10fe69e03942cd5f254dc735e /client/mysql_plugin.c | |
| parent | 1fa5183241e5a8e8e91690f0c35d676e9f3334ca (diff) | |
| parent | f7c8dd6bc7bb6d46d1ae2b6fdb47227429387e33 (diff) | |
| download | mariadb-git-84651126c0f101ea762eec0eb4045f533a00e96d.tar.gz | |
MySQL-5.5.36 merge
(without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
Diffstat (limited to 'client/mysql_plugin.c')
| -rw-r--r-- | client/mysql_plugin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql_plugin.c b/client/mysql_plugin.c index c3fa1a49e81..99da157f8c6 100644 --- a/client/mysql_plugin.c +++ b/client/mysql_plugin.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 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 @@ -857,7 +857,7 @@ static int process_options(int argc, char *argv[], char *operation) strncat(buff, FN_DIRSEP, sizeof(buff) - strlen(buff) - 1); #endif buff[sizeof(buff) - 1]= 0; - my_delete(opt_basedir, MYF(0)); + my_free(opt_basedir); opt_basedir= my_strdup(buff, MYF(MY_FAE)); } } |