diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-04-22 19:51:24 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-04-22 19:51:24 -0400 |
| commit | 629f0ec8440ebadeaa13cf4676002b58708160fe (patch) | |
| tree | e4264e211bc827f590b0f17b66228509a021b1e3 | |
| parent | 8b9ba8328774ed7cdcb059dc2ce285e14c1c095c (diff) | |
| parent | 8821d09cbf23aadde47f5bdda24ccac8ed176545 (diff) | |
| download | mariadb-git-629f0ec8440ebadeaa13cf4676002b58708160fe.tar.gz | |
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
| -rw-r--r-- | sql/log_event.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 3b499b8d502..b627636186b 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -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; } |