← 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: 2011-02-18 16:48:57 UTC
  • mfrom: (2180.1.3 drizzle-staging)
  • Revision ID: brian@tangent.org-20110218164857-4n61en8wai9c91gi
Rollup all of Olaf's branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
457
457
      skip_lines--;
458
458
      continue;
459
459
    }
460
 
    it.rewind();
 
460
    it= fields_vars;
461
461
    unsigned char *pos=read_info.row_start;
462
462
#ifdef HAVE_VALGRIND
463
463
    read_info.row_end[0]=0;
562
562
  enclosed_length=enclosed.length();
563
563
  id= 0;
564
564
 
565
 
  for (;;it.rewind())
 
565
  for (;;it= fields_vars)
566
566
  {
567
567
    if (session->getKilled())
568
568
    {