database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-26 01:44:06 +03:00
Code Activity

Merge mysql.com:/home/kostja/mysql/tmp_merge

Browse Source 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
This commit is contained in:
konstantin@mysql.com
2006-02-02 16:57:34 +03:00
parent 065f8066d5 87f685edef
commit 92b41ba92a
37 changed files with 266 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmysql/libmysql.c
View File

@@ -818,7 +818,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename)
if ((*options->local_infile_init)(&li_ptr, net_filename,
options->local_infile_userdata))
{
my_net_write(net,"",0); /* Server needs one packet */
VOID(my_net_write(net,"",0)); /* Server needs one packet */
net_flush(net);
strmov(net->sqlstate, unknown_sqlstate);
net->last_errno= (*options->local_infile_error)(li_ptr,