database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0

Browse Source 
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
This commit is contained in:
vva@eagle.mysql.r18.ru
2003-04-22 19:50:21 -04:00
parent d2bfaed9c2 9588dc01e5
commit 56667e1eba
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/log_event.cc
View File

@@ -1921,13 +1921,13 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
close_thread_tables(thd);
if (thd->query_error)
{
int sql_error = thd->net.last_errno;
int sql_error= thd->net.last_errno;
if (!sql_error)
sql_error = ER_UNKNOWN_ERROR;
sql_error= ER_UNKNOWN_ERROR;
slave_print_error(rli,sql_error,
"Slave: Error '%s' running load data infile ",
ER_SAFE(sql_error));
"Error '%s' running load data infile",
sql_error ? thd->net.last_error :
ER_SAFE(ER_UNKNOWN_ERROR));
free_root(&thd->mem_root,0);
return 1;
}
@@ -1935,7 +1935,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
if (thd->fatal_error)
{
sql_print_error("Slave: Fatal error running LOAD DATA INFILE ");
sql_print_error("Fatal error running LOAD DATA INFILE ");
return 1;
}