diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-09-11 20:31:40 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-09-11 20:31:40 +0300 |
| commit | 12787aa372b21a6e886e051ba95879f79412b2d2 (patch) | |
| tree | 1475a169c541e6b7aedb36103dd255fe52fc0517 /mysys/my_getopt.c | |
| parent | d08ccf3342bdd4457c2522a2251df21fce1222b2 (diff) | |
| parent | 43c0c0dbcf61b564675df3949f72340068675c54 (diff) | |
| download | mariadb-git-12787aa372b21a6e886e051ba95879f79412b2d2.tar.gz | |
merge with 4.1 tree
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
libmysql/errmsg.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'mysys/my_getopt.c')
| -rw-r--r-- | mysys/my_getopt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index cbbf876ac06..06e7b626bd7 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -525,8 +525,7 @@ static int setval(const struct my_option *opts, gptr *value, char *argument, break; case GET_STR_ALLOC: if ((*((char**) result_pos))) - my_free((*(char**) result_pos), - MYF(MY_WME | MY_FAE)); + my_free((*(char**) result_pos), MYF(MY_WME | MY_FAE)); if (!(*((char**) result_pos)= my_strdup(argument, MYF(MY_WME)))) return EXIT_OUT_OF_MEMORY; break; |