← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/discover_ms.cc

  • Committer: lbieber
  • Date: 2010-10-06 16:34:16 UTC
  • mfrom: (1816.1.3 build)
  • Revision ID: lbieber@orisndriz08-20101006163416-ea0sl59qgpglk21y
Merge Monty - Change the requirement from either libinnodb to libhaildb. Also, tied it to version 2.2
Merge Andrew - fix bug 650935: remove --compress from all clients
Merge Andrew - fix bug 653471: Add -A to drizzle client
Merge Travis - 621861 = To change C structs to C++ classes in Drizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/discover_ms.cc
1
 
/* Copyright (C) 2008 PrimeBase Technologies GmbH, Germany
 
1
/* Copyright (c) 2008 PrimeBase Technologies GmbH, Germany
2
2
 * Derived from code Copyright (C) 2000-2004 MySQL AB
3
3
 *
4
4
 * PrimeBase MS
1148
1148
    goto err;
1149
1149
  }
1150
1150
 
1151
 
  pthread_mutex_lock(&LOCK_open);
 
1151
  LOCK_open.lock;
1152
1152
  if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))
1153
1153
  {
1154
1154
    if (!access(path,F_OK))
1256
1256
#endif
1257
1257
  error= FALSE;
1258
1258
unlock_and_end:
1259
 
  pthread_mutex_unlock(&LOCK_open);
 
1259
  LOCK_open.unlock;
1260
1260
 
1261
1261
err:
1262
1262
  thd_proc_info(thd, "After create");