← 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-06-22 20:04:22 UTC
  • mfrom: (2318.6.39 rf)
  • Revision ID: me@mark.atwood.name-20110622200422-609npl456o0e5p32
merge lp:~olafvdspek/drizzle/refactor13

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/discover_ms.cc
322
322
          {
323
323
            uint cnv_errs;
324
324
            conv.copy(tmp->ptr(), tmp->length(), tmp->charset(), cs, &cnv_errs);
325
 
            interval->type_names[i]= strmake_root(thd->mem_root, conv.ptr(),
 
325
            interval->type_names[i]= strmake(thd->mem_root, conv.ptr(),
326
326
                                                  conv.length());
327
327
            interval->type_lengths[i]= conv.length();
328
328
          }