diff options
| author | lars/lthalmann@dl145h.mysql.com <> | 2007-05-28 09:25:40 +0200 |
|---|---|---|
| committer | lars/lthalmann@dl145h.mysql.com <> | 2007-05-28 09:25:40 +0200 |
| commit | 95068ddacb5fe5294e52848a569a6788a58d5148 (patch) | |
| tree | fdef5efab6fda867f98a6baf731f42572a06282b /sql/sql_load.cc | |
| parent | 7034295f79cdc1ea942d4afb98950993c64cf503 (diff) | |
| parent | 8b1deb28bfaab4967fc6ba0697da774a5ad2f5c9 (diff) | |
| download | mariadb-git-95068ddacb5fe5294e52848a569a6788a58d5148.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index a98797d7596..5c7a29df33b 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -413,9 +413,6 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, if (error) { - if (transactional_table) - ha_autocommit_or_rollback(thd,error); - if (read_file_from_client) while (!read_info.next_line()) ; @@ -463,6 +460,9 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, } } #endif /*!EMBEDDED_LIBRARY*/ + if (transactional_table) + ha_autocommit_or_rollback(thd,error); + error= -1; // Error on read goto err; } |