diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-07-13 15:28:29 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-07-13 15:28:29 +0300 |
| commit | 98708011233ac2ba78650a5f67f6b4ade0c762f7 (patch) | |
| tree | eadb7a7afb799d3328b17583f97705bac2c60c7a /sql | |
| parent | 7ee050590f6775254185ffa7cff52adffd3a3bfb (diff) | |
| parent | 1e23a0efef15a81e1212541c1f745bbeeac8e3b8 (diff) | |
| download | mariadb-git-98708011233ac2ba78650a5f67f6b4ade0c762f7.tar.gz | |
Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_load.cc | 3 |
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()) { /* |