← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/discover_ms.cc

  • Committer: Mark Atwood
  • Date: 2011-07-13 22:28:29 UTC
  • mfrom: (2318.7.25 refactor1)
  • Revision ID: me@mark.atwood.name-20110713222829-sswp061b5ts7tc1k
merge lp:~olafvdspek/drizzle/refactor1

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/discover_ms.cc
317
317
        for (uint i= 0; (tmp= int_it++); i++)
318
318
        {
319
319
          uint lengthsp;
320
 
          if (String::needs_conversion(tmp->length(), tmp->charset(),
321
 
                                       cs, &dummy))
 
320
          if (String::needs_conversion(tmp->length(), tmp->charset(), cs))
322
321
          {
323
322
            uint cnv_errs;
324
323
            conv.copy(tmp->ptr(), tmp->length(), tmp->charset(), cs, &cnv_errs);