← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Brian Aker
  • Date: 2010-02-19 23:42:02 UTC
  • mto: (1273.19.18 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1309.
  • Revision ID: brian@gir.tangent.org-20100219234202-boogaw8j3folts51
Basic engine with test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
308
308
  info.handle_duplicates=handle_duplicates;
309
309
  info.escape_char=escaped->length() ? (*escaped)[0] : INT_MAX;
310
310
 
311
 
  SchemaIdentifier identifier(session->db);
312
311
  READ_INFO read_info(file, tot_length,
313
 
                      ex->cs ? ex->cs : plugin::StorageEngine::getSchemaCollation(identifier),
314
 
                      *field_term, *ex->line_start, *ex->line_term, *enclosed,
 
312
                      ex->cs ? ex->cs : get_default_db_collation(session->db.c_str()),
 
313
                      *field_term,*ex->line_start, *ex->line_term, *enclosed,
315
314
                      info.escape_char, is_fifo);
316
315
  if (read_info.error)
317
316
  {
388
387
    error= -1;                          // Error on read
389
388
    goto err;
390
389
  }
391
 
  snprintf(name, sizeof(name), ER(ER_LOAD_INFO), (uint32_t) info.records, (uint32_t) info.deleted,
 
390
  sprintf(name, ER(ER_LOAD_INFO), (uint32_t) info.records, (uint32_t) info.deleted,
392
391
          (uint32_t) (info.records - info.copied), (uint32_t) session->cuted_fields);
393
392
 
394
393
  if (session->transaction.stmt.hasModifiedNonTransData())