Merge marko@build.mysql.com:/home/bk/mysql-4.0

into hundin.mysql.fi:/home/marko/j/mysql-4.0

Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
e4fd7621 · unknown · 8a092002 · fef01eee · e4fd7621
Commit e4fd7621 authored Jul 13, 2004 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sql/sql_load.cc sql/sql_load.cc +3 -0

No files found.
--- 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())
    {
      /*