← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/locking/global.cc

Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/locking/global.cc
76
76
  Change to use malloc() ONLY when using LOCK TABLES command or when
77
77
  we are forced to use mysql_lock_merge.
78
78
*/
79
 
#include "config.h"
 
79
#include <config.h>
80
80
 
81
81
#include <fcntl.h>
82
82