← 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: 2009-05-14 16:47:01 UTC
  • mfrom: (1014.3.4 merge)
  • Revision ID: brian@gaz-20090514164701-l58qmp3mqo6et160
Merging Brian's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
294
294
  info.handle_duplicates=handle_duplicates;
295
295
  info.escape_char=escaped->length() ? (*escaped)[0] : INT_MAX;
296
296
 
297
 
  READ_INFO read_info(file,tot_length,
298
 
                      ex->cs ? ex->cs : session->variables.collation_database,
 
297
  READ_INFO read_info(file, tot_length,
 
298
                      ex->cs ? ex->cs : get_default_db_collation(session->db),
299
299
                      *field_term,*ex->line_start, *ex->line_term, *enclosed,
300
300
                      info.escape_char, is_fifo);
301
301
  if (read_info.error)