Commit 434b5c7d authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
parents e2a42454 7b98930a

sql/sql_load.cc

+2 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, 
    if (handle_duplicates == DUP_IGNORE ||

	handle_duplicates == DUP_REPLACE)

      table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);

    ha_enable_transaction(thd, FALSE); 

    table->file->start_bulk_insert((ha_rows) 0);

    table->copy_blobs=1;

    if (!field_term->length() && !enclosed->length())
@@ -281,6 +282,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, 
			   skip_lines);

    if (table->file->end_bulk_insert())

      error=1;					/* purecov: inspected */

    ha_enable_transaction(thd, TRUE);

    table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);

    table->next_number_field=0;

  }