← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_open.cc

Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_open.cc
181
181
    disk_pos= my_n_base_info_read(disk_cache + base_pos, &share->base);
182
182
    share->state.state_length=base_pos;
183
183
 
184
 
    if (!(open_flags & HA_OPEN_FOR_REPAIR) &&
185
 
        ((share->state.changed & STATE_CRASHED) ||
186
 
         ((open_flags & HA_OPEN_ABORT_IF_CRASHED) &&
187
 
          (share->state.open_count))))
 
184
    if (share->state.changed & STATE_CRASHED)
188
185
    {
189
186
      my_errno=((share->state.changed & STATE_CRASHED_ON_REPAIR) ?
190
187
                HA_ERR_CRASHED_ON_REPAIR : HA_ERR_CRASHED_ON_USAGE);