summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2004-07-13 13:54:20 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2004-07-13 13:54:20 +0300
commit1e23a0efef15a81e1212541c1f745bbeeac8e3b8 (patch)
tree13f8a8d966fe0a55bf703156c06eca7924afb749
parent7b6fc58ffff432df623d78511eab7e19ddb32f50 (diff)
downloadmariadb-git-1e23a0efef15a81e1212541c1f745bbeeac8e3b8.tar.gz
A fix for a long standing bug in LOAD DATA .. LOCAL ..'
sql/sql_load.cc: A fix for a long standing bug in LOAD DATA .. LOCAL ..' When the error occurs, a link is broken instead of simply returning the error message and maintaining the same connection.
-rw-r--r--sql/sql_load.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index a3ba14373b2..501852b5de8 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -291,6 +291,9 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
{
if (transactional_table)
ha_autocommit_or_rollback(thd,error);
+ if (read_file_from_client)
+ while (!read_info.next_line())
+ ;
if (mysql_bin_log.is_open())
{
/*