← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/create_field.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/create_field.cc
47
47
 
48
48
#include <algorithm>
49
49
 
 
50
using namespace drizzled;
50
51
using namespace std;
51
52
 
52
53
 
108
109
      char buff[MAX_FIELD_WIDTH], *pos;
109
110
      String tmp(buff, sizeof(buff), charset), *res;
110
111
      res= orig_field->val_str(&tmp);
111
 
      pos= (char*) sql_strmake(res->ptr(), res->length());
 
112
      pos= (char*) memory::sql_strmake(res->ptr(), res->length());
112
113
      def= new Item_string(pos, res->length(), charset);
113
114
    }
114
115
    orig_field->move_field_offset(-diff);       // Back to record[0]