← Back to branch summary

~maria-captains/maria/mysql-6.0-backup

« back to all changes in this revision

Viewing changes to storage/heap/ha_heap.cc

  • Committer: Thava Alagu
  • Date: 2010-03-11 19:18:17 UTC
  • mfrom: (3719.14.62 mysql-6.0-codebase)
  • Revision ID: thavamuni.alagu@sun.com-20100311191817-5nigmq884xo9fuut
Merge from mysql-6.0-codebase

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/ha_heap.cc
697
697
      if (field->flags & (ENUM_FLAG | SET_FLAG))
698
698
        seg->charset= &my_charset_bin;
699
699
      else
700
 
        seg->charset= field->charset();
 
700
        seg->charset= field->charset_for_protocol();
701
701
      if (field->null_ptr)
702
702
      {
703
703
        seg->null_bit= field->null_bit;