← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
404
404
 
405
405
    if (field->has_charset())
406
406
    {
407
 
      if (field->charset() != share->table_charset)
408
 
      {
409
 
        packet->append(STRING_WITH_LEN(" CHARACTER SET "));
410
 
        packet->append(field->charset()->csname);
411
 
      }
412
 
 
413
407
      /*
414
408
        For string types dump collation name only if
415
409
        collation is not primary for the given charset