← 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: Barry.Leslie at PrimeBase
  • Date: 2010-10-18 21:21:20 UTC
  • mto: This revision was merged to the branch mainline in revision 1871.
  • Revision ID: barry.leslie@primebase.com-20101018212120-dqukgtkwhb1imt1o
Merged changes from lp:pbms. These changes should remove any danger
of longjmp() clobbering local variables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/discover_ms.cc
1148
1148
    goto err;
1149
1149
  }
1150
1150
 
1151
 
  LOCK_open.lock;
 
1151
  pthread_mutex_lock(&LOCK_open);
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
 
  LOCK_open.unlock;
 
1259
  pthread_mutex_unlock(&LOCK_open);
1260
1260
 
1261
1261
err:
1262
1262
  thd_proc_info(thd, "After create");