diff options
| author | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-05-28 09:21:42 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-05-28 09:21:42 +0200 |
| commit | 9f757559ee14a6fee66917429b5e36f921475442 (patch) | |
| tree | 87dbb6faf814442368a60f35abb6d44a798585c2 /sql/sql_load.cc | |
| parent | 06297270880ca0f0023c66ca90291665ec3aacc2 (diff) | |
| parent | a53b80b3f3f187370d3360202b7849856ab9582a (diff) | |
| download | mariadb-git-9f757559ee14a6fee66917429b5e36f921475442.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/sql_load.cc:
Auto merged
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 d14e165a788..c2267ba5dfc 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -414,9 +414,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()) ; @@ -460,6 +457,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; } |