← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/common.h

  • Committer: Olaf van der Spek
  • Date: 2011-03-29 12:04:36 UTC
  • mto: (2257.1.1 build) (2276.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: olafvdspek@gmail.com-20110329120436-vozkuer8vqgh027p
Always call assert()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/common.h
18
18
 */
19
19
 
20
20
/*
21
 
** Common definition between mysql server & client
 
21
** Common definition between Drizzle server & client
22
22
*/
23
23
 
24
 
#ifndef DRIZZLED_COMMON_H
25
 
#define DRIZZLED_COMMON_H
 
24
#pragma once
26
25
 
27
26
#include <unistd.h>
28
27
#include <stdint.h>
172
171
  COM_SHUTDOWN,
173
172
  COM_CONNECT,
174
173
  COM_PING,
 
174
  COM_KILL,
175
175
  /* don't forget to update const char *command_name[] in sql_parse.cc */
176
176
  /* Must be last */
177
177
  COM_END
190
190
                        DRIZZLE_TYPE_DECIMAL,
191
191
                        DRIZZLE_TYPE_ENUM,
192
192
                        DRIZZLE_TYPE_BLOB,
193
 
                        DRIZZLE_TYPE_UUID
 
193
                        DRIZZLE_TYPE_TIME,
 
194
                        DRIZZLE_TYPE_BOOLEAN,
 
195
                        DRIZZLE_TYPE_UUID,
 
196
                        DRIZZLE_TYPE_MICROTIME
194
197
};
195
 
const int enum_field_types_size= DRIZZLE_TYPE_UUID + 1;
 
198
const int enum_field_types_size= DRIZZLE_TYPE_MICROTIME + 1;
196
199
 
197
200
} /* namespace drizzled */
198
201
 
199
202
#endif /* defined(__cplusplus) */
200
203
 
201
 
#endif /* DRIZZLED_COMMON_H */