Commit 0b076d2c authored by unknown's avatar unknown
Browse files

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
parents 94249ec8 4fc1801d

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ joerg@mysql.com 
joreland@mysql.com

jorge@linux.jorge.mysql.com

jplindst@t41.(none)

kaa@polly.local

kaj@work.mysql.com

kent@mysql.com

konstantin@mysql.com

libmysql/libmysql.c

+1 −0
Original line number Diff line number Diff line
@@ -852,6 +852,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);

}