Commit b11ee0d8 authored by bar@bar.intranet.mysql.r18.ru's avatar bar@bar.intranet.mysql.r18.ru

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

into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
parents 3aea3e92 072ddb01
...@@ -801,7 +801,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename) ...@@ -801,7 +801,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename)
NET *net= &mysql->net; NET *net= &mysql->net;
int readcount; int readcount;
void *li_ptr; /* pass state to local_infile functions */ void *li_ptr; /* pass state to local_infile functions */
char *buf;; /* buffer to be filled by local_infile_read */ char *buf; /* buffer to be filled by local_infile_read */
struct st_mysql_options *options= &mysql->options; struct st_mysql_options *options= &mysql->options;
DBUG_ENTER("handle_local_infile"); DBUG_ENTER("handle_local_infile");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment