← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/create_field.cc

  • Committer: Brian Aker
  • Date: 2010-12-17 00:08:06 UTC
  • mfrom: (2002.1.4 clean)
  • Revision ID: brian@tangent.org-20101217000806-fa6kmggjnhsl4q85
Rollup for field encapsulation, monty fix for bzrignore, and Andrew bug
fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/create_field.cc
43
43
#include "drizzled/field/timestamp.h"
44
44
#include "drizzled/field/datetime.h"
45
45
#include "drizzled/field/varstring.h"
 
46
#include "drizzled/field/uuid.h"
46
47
#include "drizzled/temporal.h"
47
48
#include "drizzled/item/string.h"
48
49
 
111
112
    {
112
113
      char buff[MAX_FIELD_WIDTH], *pos;
113
114
      String tmp(buff, sizeof(buff), charset), *res;
114
 
      res= orig_field->val_str(&tmp);
 
115
      res= orig_field->val_str_internal(&tmp);
115
116
      pos= (char*) memory::sql_strmake(res->ptr(), res->length());
116
117
      def= new Item_string(pos, res->length(), charset);
117
118
    }
350
351
    case DRIZZLE_TYPE_DATE:
351
352
      length= Date::MAX_STRING_LENGTH;
352
353
      break;
 
354
    case DRIZZLE_TYPE_UUID:
 
355
      length= field::Uuid::max_string_length();
 
356
      break;
353
357
    case DRIZZLE_TYPE_DATETIME:
354
358
      length= DateTime::MAX_STRING_LENGTH;
355
359
      break;