← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/display.cc

  • Committer: Brian Aker
  • Date: 2011-01-08 10:35:13 UTC
  • mfrom: (2057.2.9 timestamp)
  • Revision ID: brian@tangent.org-20110108103513-3wuo8tsyajjcxjrg
Merge in fractional seconds to timestamp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/display.cc
43
43
static const std::string DRIZZLE_TYPE_DOUBLE("DRIZZLE_TYPE_DOUBLE"); 
44
44
static const std::string DRIZZLE_TYPE_NULL("DRIZZLE_TYPE_NULL"); 
45
45
static const std::string DRIZZLE_TYPE_TIMESTAMP("DRIZZLE_TYPE_TIMESTAMP"); 
 
46
static const std::string DRIZZLE_TYPE_MICROTIME("DRIZZLE_TYPE_MICROTIME"); 
46
47
static const std::string DRIZZLE_TYPE_LONGLONG("DRIZZLE_TYPE_LONGLONG"); 
47
48
static const std::string DRIZZLE_TYPE_DATETIME("DRIZZLE_TYPE_DATETIME"); 
48
49
static const std::string DRIZZLE_TYPE_TIME("DRIZZLE_TYPE_TIME"); 
239
240
    return DRIZZLE_TYPE_DOUBLE;
240
241
  case drizzled::DRIZZLE_TYPE_NULL : 
241
242
    return DRIZZLE_TYPE_NULL;
 
243
  case drizzled::DRIZZLE_TYPE_MICROTIME : 
 
244
    return DRIZZLE_TYPE_MICROTIME;
242
245
  case drizzled::DRIZZLE_TYPE_TIMESTAMP : 
243
246
    return DRIZZLE_TYPE_TIMESTAMP;
244
247
  case drizzled::DRIZZLE_TYPE_LONGLONG :