mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
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
This commit is contained in:
@ -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);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user