~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/select_create.h

  • Committer: Patrick Crews
  • Date: 2010-08-17 16:41:12 UTC
  • mfrom: (1711.6.2 staging)
  • mto: This revision was merged to the branch mainline in revision 1714.
  • Revision ID: gleebix@gmail.com-20100817164112-vaa55iprokbg6m1k
Merge Brian's recursive mutex removal tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
  AlterInfo *alter_info;
34
34
  Field **field;
35
35
  /* lock data for tmp table */
36
 
  DRIZZLE_LOCK *m_lock;
 
36
  DrizzleLock *m_lock;
37
37
  /* m_lock or session->extra_lock */
38
 
  DRIZZLE_LOCK **m_plock;
 
38
  DrizzleLock **m_plock;
39
39
  TableIdentifier &identifier;
40
40
 
41
41
public: