← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/fdecimal.cc

  • Committer: Felipe
  • Date: 2008-08-04 23:58:04 UTC
  • mto: (261.2.6 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: felipe@pena-20080804235804-x55q2xqxcar6u66f
- Renamed MYSQL_ERROR to DRIZZLE_ERROR.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/fdecimal.cc
116
116
  /* check that we do not try to write negative value in unsigned field */
117
117
  if (unsigned_flag && decimal_value->sign())
118
118
  {
119
 
    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
 
119
    set_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
120
120
    error= 1;
121
121
    decimal_value= &decimal_zero;
122
122
  }
149
149
    String from_as_str;
150
150
    from_as_str.copy(from, length, &my_charset_bin);
151
151
 
152
 
    push_warning_printf(table->in_use, MYSQL_ERROR::WARN_LEVEL_ERROR,
 
152
    push_warning_printf(table->in_use, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
153
153
                        ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,
154
154
                        ER(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD),
155
155
                        "decimal", from_as_str.c_ptr(), field_name,
160
160
 
161
161
  switch (err) {
162
162
  case E_DEC_TRUNCATED:
163
 
    set_warning(MYSQL_ERROR::WARN_LEVEL_NOTE, ER_WARN_DATA_TRUNCATED, 1);
 
163
    set_warning(DRIZZLE_ERROR::WARN_LEVEL_NOTE, ER_WARN_DATA_TRUNCATED, 1);
164
164
    break;
165
165
  case E_DEC_OVERFLOW:
166
 
    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
 
166
    set_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE, 1);
167
167
    set_value_on_overflow(&decimal_value, decimal_value.sign());
168
168
    break;
169
169
  case E_DEC_BAD_NUM:
172
172
      String from_as_str;
173
173
      from_as_str.copy(from, length, &my_charset_bin);
174
174
 
175
 
    push_warning_printf(table->in_use, MYSQL_ERROR::WARN_LEVEL_WARN,
 
175
    push_warning_printf(table->in_use, DRIZZLE_ERROR::WARN_LEVEL_WARN,
176
176
                        ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,
177
177
                        ER(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD),
178
178
                          "decimal", from_as_str.c_ptr(), field_name,