summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authorunknown <vva@eagle.mysql.r18.ru>2003-04-22 19:38:57 -0400
committerunknown <vva@eagle.mysql.r18.ru>2003-04-22 19:38:57 -0400
commit60d620aee0f586cae0424cac2ae79e70aa59281d (patch)
tree27e5c9a70c4e2da6c69f77209653b85628190610 /sql/log_event.cc
parent5b67416a0b7b42279cd5ddb8ef53c60f66d59761 (diff)
downloadmariadb-git-60d620aee0f586cae0424cac2ae79e70aa59281d.tar.gz
fix error message for for load data infile
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index c8eb4026120..f87a3872324 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1922,13 +1922,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;
}
@@ -1936,7 +1936,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;
}