← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_open.cc

  • Committer: Brian Aker
  • Date: 2009-07-12 00:49:18 UTC
  • mfrom: (1063.9.51 brian-tmp-fix)
  • Revision ID: brian@gaz-20090712004918-chprmyj387ex6l8a
Merge Stewart

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_open.cc
415
415
        share->lock.check_status= mi_check_status;
416
416
      }
417
417
    }
418
 
    /*
419
 
      Memory mapping can only be requested after initializing intern_lock.
420
 
    */
421
 
    if (open_flags & HA_OPEN_MMAP)
422
 
    {
423
 
      info.s= share;
424
 
      mi_extra(&info, HA_EXTRA_MMAP, 0);
425
 
    }
426
418
  }
427
419
  else
428
420
  {
491
483
  {
492
484
    share->temporary=share->delay_key_write=1;
493
485
    share->write_flag=MYF(MY_NABP);
494
 
    share->w_locks++;                   /* We don't have to update status */
495
 
    share->tot_locks++;
 
486
    /*
 
487
     * The following two statements are commented out as a fix of
 
488
     * bug https://bugs.launchpad.net/drizzle/+bug/387627
 
489
     *
 
490
     * UPDATE can be TRUNCATE on TEMPORARY TABLE (MyISAM).
 
491
     * The root cause of why this makes a difference hasn't
 
492
     * been found, but this fixes things for now.
 
493
     */
 
494
//    share->w_locks++;                 // We don't have to update status
 
495
//    share->tot_locks++;
496
496
    info.lock_type=F_WRLCK;
497
497
  }
498
498
  if (((open_flags & HA_OPEN_DELAY_KEY_WRITE) ||