1 files changed, 2 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 29c6f469098..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);
 }
 
@@ -1509,7 +1510,7 @@ ulong STDCALL mysql_thread_id(MYSQL *mysql)
 
 const char * STDCALL mysql_character_set_name(MYSQL *mysql)
 {
-  return mysql->charset->name;
+  return mysql->charset->csname;
 }