← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_open.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-08-26 03:17:31 UTC
  • mfrom: (1124 staging)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: osullivan.padraig@gmail.com-20090826031731-at2as3ledixngra3
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_open.cc
123
123
    if (share->options &
124
124
        ~(HA_OPTION_PACK_RECORD | HA_OPTION_PACK_KEYS |
125
125
          HA_OPTION_COMPRESS_RECORD | HA_OPTION_READ_ONLY_DATA |
126
 
          HA_OPTION_TEMP_COMPRESS_RECORD | HA_OPTION_CHECKSUM |
127
 
          HA_OPTION_TMP_TABLE | HA_OPTION_DELAY_KEY_WRITE |
128
 
          HA_OPTION_RELIES_ON_SQL_LAYER))
 
126
          HA_OPTION_TEMP_COMPRESS_RECORD |
 
127
          HA_OPTION_TMP_TABLE
 
128
          ))
129
129
    {
130
130
      my_errno=HA_ERR_OLD_FILE;
131
131
      goto err;
629
629
  }
630
630
  share->file_read= mi_nommap_pread;
631
631
  share->file_write= mi_nommap_pwrite;
632
 
  if (!(share->options & HA_OPTION_CHECKSUM))
633
 
    share->calc_checksum=0;
634
 
  return;
 
632
  share->calc_checksum=0;
635
633
}
636
634
 
637
635