diff options
| author | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2007-02-27 18:40:57 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2007-02-27 18:40:57 +0100 |
| commit | 0ddc3250e924d5103cb8db298ba467d053f432d3 (patch) | |
| tree | 3a54572d78bbd33bcb8d4e33610f903bdafba45f /sql/sql_load.cc | |
| parent | 3f507f2993b2af05e625077b43555fe5cc069687 (diff) | |
| parent | 2e669d8e7b5944ad4a785ccd11424e060c5ce9bc (diff) | |
| download | mariadb-git-0ddc3250e924d5103cb8db298ba467d053f432d3.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
sql/sql_load.cc:
Manual merge
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 8aa3f96fb95..0d3f9ca8f81 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -455,7 +455,6 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, } sprintf(name, ER(ER_LOAD_INFO), (ulong) info.records, (ulong) info.deleted, (ulong) (info.records - info.copied), (ulong) thd->cuted_fields); - send_ok(thd,info.copied+info.deleted,0L,name); if (!transactional_table) thd->options|=OPTION_STATUS_NO_TRANS_UPDATE; @@ -476,6 +475,8 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, if (transactional_table) error=ha_autocommit_or_rollback(thd,error); + /* ok to client sent only after binlog write and engine commit */ + send_ok(thd, info.copied + info.deleted, 0L, name); err: if (thd->lock) { |