← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_check.cc

  • Committer: Lee Bieber
  • Date: 2011-03-28 18:11:45 UTC
  • mfrom: (2254.1.2 build)
  • Revision ID: kalebral@gmail.com-20110328181145-tfsb6s5ozhuvhfoq
Merge Patrick - Tweaked dbqp so that the existing slave tests work.
Merge Stewart - remove over 1000 lines of mysys

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_check.cc
1611
1611
      info->dfile=new_file= -1;
1612
1612
      if (change_to_newfile(share->data_file_name,MI_NAME_DEXT,
1613
1613
                            DATA_TMP_EXT, share->base.raid_chunks,
1614
 
                            (param->testflag & T_BACKUP_DATA ?
1615
 
                             MYF(MY_REDEL_MAKE_BACKUP): MYF(0))) ||
 
1614
                            MYF(0)) ||
1616
1615
          mi_open_datafile(info,share,-1))
1617
1616
        got_error=1;
1618
1617
    }
2296
2295
      info->dfile=new_file= -1;
2297
2296
      if (change_to_newfile(share->data_file_name,MI_NAME_DEXT,
2298
2297
                            DATA_TMP_EXT, share->base.raid_chunks,
2299
 
                            (param->testflag & T_BACKUP_DATA ?
2300
 
                             MYF(MY_REDEL_MAKE_BACKUP): MYF(0))) ||
 
2298
                            MYF(0)) ||
2301
2299
          mi_open_datafile(info,share,-1))
2302
2300
        got_error=1;
2303
2301
    }