~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/common.h

  • Committer: Brian Aker
  • Date: 2010-10-27 21:00:49 UTC
  • mto: This revision was merged to the branch mainline in revision 1886.
  • Revision ID: brian@tangent.org-20101027210049-zfpgx2cfbrh8maq9
A couple of fixes to documentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
126
126
/* The following are only sent to new clients */
127
127
#define ENUM_FLAG       256             /* field is an enum */
128
128
#define AUTO_INCREMENT_FLAG 512         /* field is a autoincrement field */
129
 
#define FUNCTION_DEFAULT_FLAG   1024            /* Field is a timestamp, uses a function to generate the value. */
 
129
#define TIMESTAMP_FLAG  1024            /* Field is a timestamp */
130
130
#define NO_DEFAULT_VALUE_FLAG 4096      /* Field doesn't have default value */
131
131
#define ON_UPDATE_NOW_FLAG 8192         /* Field is set to NOW on UPDATE */
132
132
#define PART_KEY_FLAG   16384           /* Intern; Part of some key */
178
178
};
179
179
 
180
180
 
181
 
enum enum_field_types { 
182
 
                        DRIZZLE_TYPE_LONG,
 
181
enum enum_field_types { DRIZZLE_TYPE_LONG,
183
182
                        DRIZZLE_TYPE_DOUBLE,
184
183
                        DRIZZLE_TYPE_NULL,
185
184
                        DRIZZLE_TYPE_TIMESTAMP,
190
189
                        DRIZZLE_TYPE_DECIMAL,
191
190
                        DRIZZLE_TYPE_ENUM,
192
191
                        DRIZZLE_TYPE_BLOB,
193
 
                        DRIZZLE_TYPE_TIME,
194
 
                        DRIZZLE_TYPE_BOOLEAN,
195
 
                        DRIZZLE_TYPE_UUID,
196
 
                        DRIZZLE_TYPE_MICROTIME
 
192
                        DRIZZLE_TYPE_MAX=DRIZZLE_TYPE_BLOB
197
193
};
198
 
const int enum_field_types_size= DRIZZLE_TYPE_MICROTIME + 1;
199
194
 
200
195
} /* namespace drizzled */
201
196