← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/default_value.cc

  • Committer: Olaf van der Spek
  • Date: 2011-07-04 19:11:47 UTC
  • mto: This revision was merged to the branch mainline in revision 2367.
  • Revision ID: olafvdspek@gmail.com-20110704191147-s99ojek811zi1fzj
Remove unused Name_resolution_context::error_reporter

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/default_value.cc
37
37
 
38
38
bool Item_default_value::fix_fields(Session *session, Item **)
39
39
{
40
 
  Item *real_arg;
41
 
  Item_field *field_arg;
42
 
  Field *def_field;
43
40
  assert(fixed == 0);
44
41
 
45
42
  if (!arg)
48
45
    return false;
49
46
  }
50
47
  if (!arg->fixed && arg->fix_fields(session, &arg))
51
 
    goto error;
52
 
 
53
 
 
54
 
  real_arg= arg->real_item();
 
48
    return true;
 
49
 
 
50
 
 
51
  Item* real_arg= arg->real_item();
55
52
  if (real_arg->type() != FIELD_ITEM)
56
53
  {
57
54
    my_error(ER_NO_DEFAULT_FOR_FIELD, MYF(0), arg->name);
58
 
    goto error;
 
55
    return true;
59
56
  }
60
57
 
61
 
  field_arg= (Item_field *)real_arg;
 
58
  Item_field* field_arg= (Item_field *)real_arg;
62
59
  if (field_arg->field->flags & NO_DEFAULT_VALUE_FLAG)
63
60
  {
64
61
    my_error(ER_NO_DEFAULT_FOR_FIELD, MYF(0), field_arg->field->field_name);
65
 
    goto error;
 
62
    return true;
66
63
  }
67
 
  if (!(def_field= (Field*) memory::sql_alloc(field_arg->field->size_of())))
68
 
    goto error;
 
64
  Field* def_field= (Field*) memory::sql_alloc(field_arg->field->size_of());
69
65
  memcpy(def_field, field_arg->field, field_arg->field->size_of());
70
 
  def_field->move_field_offset((ptrdiff_t)
71
 
                               (def_field->getTable()->getDefaultValues() - def_field->getTable()->record[0]));
 
66
  def_field->move_field_offset((ptrdiff_t)(def_field->getTable()->getDefaultValues() - def_field->getTable()->record[0]));
72
67
  set_field(def_field);
73
68
  return false;
74
 
 
75
 
error:
76
 
  context->process_error(session);
77
 
  return true;
78
69
}
79
70
 
80
71
 
99
90
    {
100
91
      if (field_arg->reset())
101
92
      {
102
 
        my_message(ER_CANT_CREATE_GEOMETRY_OBJECT,
103
 
                   ER(ER_CANT_CREATE_GEOMETRY_OBJECT), MYF(0));
 
93
        my_message(ER_CANT_CREATE_GEOMETRY_OBJECT, ER(ER_CANT_CREATE_GEOMETRY_OBJECT), MYF(0));
104
94
        return -1;
105
95
      }
106
 
 
107
 
      {
108
 
        push_warning_printf(field_arg->getTable()->in_use,
109
 
                            DRIZZLE_ERROR::WARN_LEVEL_WARN,
110
 
                            ER_NO_DEFAULT_FOR_FIELD,
111
 
                            ER(ER_NO_DEFAULT_FOR_FIELD),
112
 
                            field_arg->field_name);
113
 
      }
 
96
      push_warning_printf(field_arg->getTable()->in_use, DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_NO_DEFAULT_FOR_FIELD, ER(ER_NO_DEFAULT_FOR_FIELD), field_arg->field_name);
114
97
      return 1;
115
98
    }
116
99
    field_arg->set_default();