← 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: 2009-05-18 22:18:17 UTC
  • mto: (1022.2.34 mordred)
  • mto: This revision was merged to the branch mainline in revision 1039.
  • Revision ID: mordred@inaugust.com-20090518221817-jkzaw9sxrgpaixem
Style move.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_load.cc
465
465
        unsigned char save_chr;
466
466
        if ((length=(uint32_t) (read_info.row_end-pos)) >
467
467
            field->field_length)
 
468
        {
468
469
          length=field->field_length;
469
 
        save_chr=pos[length]; pos[length]='\0'; // Safeguard aganst malloc
 
470
        }
 
471
        save_chr=pos[length];
 
472
        pos[length]='\0'; // Add temp null terminator for store()
470
473
        field->store((char*) pos,length,read_info.read_charset);
471
474
        pos[length]=save_chr;
472
475
        if ((pos+=length) > read_info.row_end)