~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lock.cc

MergedĀ inĀ latest.

Show diffs side-by-side

added added

removed removed

Lines of Context:
73
73
  we are forced to use mysql_lock_merge.
74
74
*/
75
75
#include <drizzled/server_includes.h>
76
 
#include <drizzled/drizzled_error_messages.h>
 
76
#include <drizzled/error.h>
77
77
 
78
78
/**
79
79
  @defgroup Locking Locking