← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/common_includes.h

Removed korr.h and tztime.h from common_includes. Also removed the HAVE_DTRACE block and stuck it in autoconf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/common_includes.h
73
73
/* Custom continguous-section memory allocator */
74
74
#include <drizzled/sql_alloc.h>
75
75
 
76
 
#include <drizzled/korr.h>
77
 
 
78
 
#ifdef HAVE_DTRACE
79
 
#define _DTRACE_VERSION 1
80
 
#else
81
 
#undef _DTRACE_VERSION
82
 
#endif
83
76
#include "probes.h"
84
77
 
85
78
 
108
101
/*
109
102
  External variables
110
103
*/
111
 
extern ulong server_id;
 
104
extern uint32_t server_id;
112
105
 
113
106
/* Custom C++-style String class API */
114
107
#include <drizzled/sql_string.h>
132
125
 
133
126
#include "sql_class.h"
134
127
#include "slave.h" // for tables_ok(), rpl_filter
135
 
#include "tztime.h"
136
128
 
137
129
void sql_perror(const char *message);
138
130