diff options
| author | unknown <monty@mysql.com> | 2005-01-18 04:03:26 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-18 04:03:26 +0200 |
| commit | 7aecbab85c5059c9d1f89188d30ac2c0dbae3ca6 (patch) | |
| tree | bb697cb498858b14ae0d525938dd3fcd68d13eaa /libmysql | |
| parent | 2524517978fe7a3d0f61a67bb7a558663b559cac (diff) | |
| parent | 985805ce6afefaf2715732809aa00c5396990662 (diff) | |
| download | mariadb-git-7aecbab85c5059c9d1f89188d30ac2c0dbae3ca6.tar.gz | |
Merge with global tree
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/order_by.result:
Auto merged
sql/filesort.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/t/order_by.test:
Merge
sql/sql_lex.cc:
Merge
sql/sql_yacc.yy:
Use local copy
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 2a2c496b914..7c6b4e31ab5 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -857,6 +857,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename) err: /* free up memory allocated with _init, usually */ (*options->local_infile_end)(li_ptr); + my_free(buf, MYF(0)); DBUG_RETURN(result); } |