← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/common_includes.h

Merging stdize-code with main trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/common_includes.h
35
35
#include <drizzled/global.h>                    
36
36
/* Server versioning information and defines */
37
37
#include <drizzled/version.h>                   
38
 
/* Lots of system-wide struct definitions like IO_CACHE, DYNAMIC_STRING, prototypes for all my_* functions */
 
38
/* Lots of system-wide struct definitions like IO_CACHE, prototypes for all my_* functions */
39
39
#include <mysys/my_sys.h>                       
40
40
/* Convenience functions for working with times */
41
 
#include <libdrizzle/my_time.h>
 
41
#include <mysys/my_time.h>
42
42
/* Custom C string functions */
43
43
#include <mystrings/m_string.h>
44
44
/* Custom HASH API */
55
55
#include <mysys/queues.h>
56
56
/* Custom Bitmap API */
57
57
#include <drizzled/sql_bitmap.h>
58
 
/* Custom templatized, type-safe Dynamic_Array API */
 
58
/* Array of pointers to Elem that uses memory from MEM_ROOT */
59
59
#include "sql_array.h"
60
60
/* The <strong>INTERNAL</strong> plugin API - not the external, or public, server plugin API */
61
61
#include "sql_plugin.h"