Skip to content

M
mariadb
Commit 6889569f authored by lars/lthalmann@mysql.com/dl145j.mysql.com's avatar lars/lthalmann@mysql.com/dl145j.mysql.com
Browse files
Options

Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge 

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
parents f872d8ff d204dc2d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
sql/sql_load.cc
View file @ 6889569f
...@@ -455,7 +455,6 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, ...@@ -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, sprintf(name, ER(ER_LOAD_INFO), (ulong) info.records, (ulong) info.deleted,
(ulong) (info.records - info.copied), (ulong) thd->cuted_fields); (ulong) (info.records - info.copied), (ulong) thd->cuted_fields);
send_ok(thd,info.copied+info.deleted,0L,name);
if (!transactional_table) if (!transactional_table)
thd->options|=OPTION_STATUS_NO_TRANS_UPDATE; thd->options|=OPTION_STATUS_NO_TRANS_UPDATE;
...@@ -476,6 +475,8 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, ...@@ -476,6 +475,8 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
if (transactional_table) if (transactional_table)
error=ha_autocommit_or_rollback(thd,error); 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: err:
if (thd->lock) if (thd->lock)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7