← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lock.cc

  • Committer: Jay Pipes
  • Date: 2008-08-06 18:46:02 UTC
  • mto: (264.1.16 codestyle)
  • mto: This revision was merged to the branch mainline in revision 266.
  • Revision ID: jay@mysql.com-20080806184602-h9azzr5ew4tbf9vj
FINAL PHASE removal of mysql_priv.h (Bye, bye my friend.)

* Moved sql_table.h functions out into separate header
* Renamed mysql_priv.h and replaced all occurences of it
* Removed redundant includes in a variety of files
* Modified Makefile.am to remove mysql_priv.h
* Marked UNUSED (dead code for removal) functions in drizzled/server_includes.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.cc
72
72
  Change to use my_malloc() ONLY when using LOCK TABLES command or when
73
73
  we are forced to use mysql_lock_merge.
74
74
*/
75
 
 
76
 
#include "mysql_priv.h"
77
 
#include <mysys/hash.h>
78
 
#include <assert.h>
 
75
#include <drizzled/server_includes.h>
79
76
#include <drizzled/drizzled_error_messages.h>
80
77
 
81
78
/**