Commit 0ddc3250 authored by unknown's avatar unknown
Browse files

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
parents 3f507f29 2e669d8e

sql/sql_load.cc

+2 −1
Original line number Diff line number Diff line
@@ -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)

  {