← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/create_field.cc

edit

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/create_field.cc
21
21
 * @file Implementation of CreateField class
22
22
 */
23
23
 
24
 
#include <config.h>
 
24
#include "config.h"
25
25
#include <errno.h>
26
26
#include <float.h>
27
 
#include <drizzled/sql_select.h>
28
 
#include <drizzled/error.h>
29
 
#include <drizzled/field.h>
30
 
#include <drizzled/create_field.h>
31
 
#include <drizzled/field/str.h>
32
 
#include <drizzled/field/num.h>
33
 
#include <drizzled/field/blob.h>
34
 
#include <drizzled/field/boolean.h>
35
 
#include <drizzled/field/enum.h>
36
 
#include <drizzled/field/null.h>
37
 
#include <drizzled/field/date.h>
38
 
#include <drizzled/field/decimal.h>
39
 
#include <drizzled/field/real.h>
40
 
#include <drizzled/field/double.h>
41
 
#include <drizzled/field/int32.h>
42
 
#include <drizzled/field/int64.h>
43
 
#include <drizzled/field/num.h>
44
 
#include <drizzled/field/epoch.h>
45
 
#include <drizzled/field/datetime.h>
46
 
#include <drizzled/field/varstring.h>
47
 
#include <drizzled/field/uuid.h>
48
 
#include <drizzled/temporal.h>
49
 
#include <drizzled/item/string.h>
50
 
#include <drizzled/table.h>
 
27
#include "drizzled/sql_select.h"
 
28
#include "drizzled/error.h"
 
29
#include "drizzled/field.h"
 
30
#include "drizzled/create_field.h"
 
31
#include "drizzled/field/str.h"
 
32
#include "drizzled/field/num.h"
 
33
#include "drizzled/field/blob.h"
 
34
#include "drizzled/field/boolean.h"
 
35
#include "drizzled/field/enum.h"
 
36
#include "drizzled/field/null.h"
 
37
#include "drizzled/field/date.h"
 
38
#include "drizzled/field/decimal.h"
 
39
#include "drizzled/field/real.h"
 
40
#include "drizzled/field/double.h"
 
41
#include "drizzled/field/int32.h"
 
42
#include "drizzled/field/int64.h"
 
43
#include "drizzled/field/num.h"
 
44
#include "drizzled/field/epoch.h"
 
45
#include "drizzled/field/datetime.h"
 
46
#include "drizzled/field/varstring.h"
 
47
#include "drizzled/field/uuid.h"
 
48
#include "drizzled/temporal.h"
 
49
#include "drizzled/item/string.h"
51
50
 
52
 
#include <drizzled/display.h>
 
51
#include "drizzled/display.h"
53
52
 
54
53
#include <algorithm>
55
54
 
75
74
 
76
75
  /* Fix if the original table had 4 byte pointer blobs */
77
76
  if (flags & BLOB_FLAG)
78
 
  {
79
 
    pack_length= (pack_length - old_field->getTable()->getShare()->sizeBlobPtr() + portable_sizeof_char_ptr);
80
 
  }
 
77
    pack_length= (pack_length - old_field->getTable()->getShare()->blob_ptr_size + portable_sizeof_char_ptr);
81
78
 
82
79
  switch (sql_type) 
83
80
  {
221
218
  interval= 0;
222
219
  pack_length= key_length= 0;
223
220
  charset= fld_charset;
224
 
  interval_list.clear();
 
221
  interval_list.empty();
225
222
 
226
223
  comment= *fld_comment;
227
224
 
375
372
        /* Should be safe. */
376
373
        pack_length= 4;
377
374
 
378
 
        List<String>::iterator it(fld_interval_list->begin());
 
375
        List_iterator<String> it(*fld_interval_list);
379
376
        String *tmp;
380
377
        while ((tmp= it++))
381
378
          interval_list.push_back(tmp);