← Back to branch summary

~posulliv/drizzle/optimizer-style-cleanup

« back to all changes in this revision

Viewing changes to drizzled/sql_load.cc

  • Committer: Padraig O'Sullivan
  • Date: 2010-04-17 01:38:47 UTC
  • mfrom: (1237.9.238 bad-staging)
  • Revision ID: osullivan.padraig@gmail.com-20100417013847-ibjioqsfbmf5yg4g
Merge trunk.

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);
311
312
  READ_INFO read_info(file, tot_length,
312
 
                      ex->cs ? ex->cs : plugin::StorageEngine::getSchemaCollation(session->db.c_str()),
313
 
                      *field_term,*ex->line_start, *ex->line_term, *enclosed,
 
313
                      ex->cs ? ex->cs : plugin::StorageEngine::getSchemaCollation(identifier),
 
314
                      *field_term, *ex->line_start, *ex->line_term, *enclosed,
314
315
                      info.escape_char, is_fifo);
315
316
  if (read_info.error)
316
317
  {
387
388
    error= -1;                          // Error on read
388
389
    goto err;
389
390
  }
390
 
  sprintf(name, ER(ER_LOAD_INFO), (uint32_t) info.records, (uint32_t) info.deleted,
 
391
  snprintf(name, sizeof(name), ER(ER_LOAD_INFO), (uint32_t) info.records, (uint32_t) info.deleted,
391
392
          (uint32_t) (info.records - info.copied), (uint32_t) session->cuted_fields);
392
393
 
393
394
  if (session->transaction.stmt.hasModifiedNonTransData())