← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/common.h

  • Committer: Brian Aker
  • Date: 2008-11-15 19:00:52 UTC
  • mfrom: (584.1.4 devel)
  • Revision ID: brian@tangent.org-20081115190052-a1rpuroqri7zw6d7
Merging Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/common.h
332
332
enum enum_field_types { DRIZZLE_TYPE_TINY,
333
333
                        DRIZZLE_TYPE_LONG,
334
334
                        DRIZZLE_TYPE_DOUBLE,
335
 
                        DRIZZLE_TYPE_NULL,   DRIZZLE_TYPE_TIMESTAMP,
 
335
                        DRIZZLE_TYPE_NULL,
 
336
                        DRIZZLE_TYPE_TIMESTAMP,
336
337
                        DRIZZLE_TYPE_LONGLONG,
337
338
                        DRIZZLE_TYPE_TIME,
338
339
                        DRIZZLE_TYPE_DATETIME,
339
 
                        DRIZZLE_TYPE_NEWDATE, DRIZZLE_TYPE_VARCHAR,
340
 
                                          DRIZZLE_TYPE_VIRTUAL,
 
340
                        DRIZZLE_TYPE_DATE,
 
341
                        DRIZZLE_TYPE_VARCHAR,
 
342
                        DRIZZLE_TYPE_VIRTUAL,
341
343
                        DRIZZLE_TYPE_NEWDECIMAL,
342
344
                        DRIZZLE_TYPE_ENUM,
343
345
                        DRIZZLE_TYPE_BLOB,