← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Monty Taylor
  • Date: 2010-03-11 18:27:20 UTC
  • mfrom: (1333 staging)
  • mto: This revision was merged to the branch mainline in revision 1348.
  • Revision ID: mordred@inaugust.com-20100311182720-hd1h87y6cb1b1mp0
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
309
309
  info.escape_char=escaped->length() ? (*escaped)[0] : INT_MAX;
310
310
 
311
311
  READ_INFO read_info(file, tot_length,
312
 
                      ex->cs ? ex->cs : get_default_db_collation(session->db.c_str()),
 
312
                      ex->cs ? ex->cs : plugin::StorageEngine::getSchemaCollation(session->db.c_str()),
313
313
                      *field_term,*ex->line_start, *ex->line_term, *enclosed,
314
314
                      info.escape_char, is_fifo);
315
315
  if (read_info.error)
390
390
  sprintf(name, ER(ER_LOAD_INFO), (uint32_t) info.records, (uint32_t) info.deleted,
391
391
          (uint32_t) (info.records - info.copied), (uint32_t) session->cuted_fields);
392
392
 
393
 
  if (session->transaction.stmt.modified_non_trans_table)
394
 
    session->transaction.all.modified_non_trans_table= true;
 
393
  if (session->transaction.stmt.hasModifiedNonTransData())
 
394
    session->transaction.all.markModifiedNonTransData();
395
395
 
396
396
  /* ok to client sent only after binlog write and engine commit */
397
397
  session->my_ok(info.copied + info.deleted, 0, 0L, name);
398
398
err:
399
399
  assert(transactional_table || !(info.copied || info.deleted) ||
400
 
              session->transaction.stmt.modified_non_trans_table);
 
400
              session->transaction.stmt.hasModifiedNonTransData());
401
401
  table->cursor->ha_release_auto_increment();
402
402
  table->auto_increment_field_not_null= false;
403
403
  session->abort_on_warning= 0;