← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/create_field.cc

  • Committer: Lee Bieber
  • Date: 2010-11-14 05:18:07 UTC
  • mfrom: (1921.4.12 catalogs)
  • Revision ID: kalebral@gmail.com-20101114051807-p69h40jbsn1byf84
Merge Brian - add execute with no return

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/create_field.cc
37
37
#include "drizzled/field/decimal.h"
38
38
#include "drizzled/field/real.h"
39
39
#include "drizzled/field/double.h"
40
 
#include "drizzled/field/int32.h"
41
 
#include "drizzled/field/int64.h"
 
40
#include "drizzled/field/long.h"
 
41
#include "drizzled/field/int64_t.h"
42
42
#include "drizzled/field/num.h"
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"
47
46
#include "drizzled/temporal.h"
48
47
#include "drizzled/item/string.h"
49
48
 
112
111
    {
113
112
      char buff[MAX_FIELD_WIDTH], *pos;
114
113
      String tmp(buff, sizeof(buff), charset), *res;
115
 
      res= orig_field->val_str_internal(&tmp);
 
114
      res= orig_field->val_str(&tmp);
116
115
      pos= (char*) memory::sql_strmake(res->ptr(), res->length());
117
116
      def= new Item_string(pos, res->length(), charset);
118
117
    }
351
350
    case DRIZZLE_TYPE_DATE:
352
351
      length= Date::MAX_STRING_LENGTH;
353
352
      break;
354
 
    case DRIZZLE_TYPE_UUID:
355
 
      length= field::Uuid::max_string_length();
356
 
      break;
357
353
    case DRIZZLE_TYPE_DATETIME:
358
354
      length= DateTime::MAX_STRING_LENGTH;
359
355
      break;