← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_create.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_create.cc
265
265
        case HA_KEYTYPE_ULONG_INT:
266
266
        case HA_KEYTYPE_LONGLONG:
267
267
        case HA_KEYTYPE_ULONGLONG:
268
 
        case HA_KEYTYPE_UINT24:
269
268
          keyseg->flag|= HA_SWAP_KEY;
270
269
          break;
271
270
        case HA_KEYTYPE_VARTEXT1:
468
467
  if (! (flags & HA_DONT_TOUCH_DATA))
469
468
    share.state.create_time= (long) time((time_t*) 0);
470
469
 
471
 
  pthread_mutex_lock(&THR_LOCK_myisam);
 
470
  THR_LOCK_myisam.lock();
472
471
 
473
472
  /*
474
473
    NOTE: For test_if_reopen() we need a real path name. Hence we need
671
670
      goto err;
672
671
  }
673
672
  errpos=0;
674
 
  pthread_mutex_unlock(&THR_LOCK_myisam);
 
673
  THR_LOCK_myisam.unlock();
675
674
  if (internal::my_close(file,MYF(0)))
676
675
    goto err;
677
676
  free((char*) rec_per_key_part);
678
677
  return(0);
679
678
 
680
679
err:
681
 
  pthread_mutex_unlock(&THR_LOCK_myisam);
 
680
  THR_LOCK_myisam.unlock();
682
681
  save_errno=errno;
683
682
  switch (errpos) {
684
683
  case 3: