← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/date.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/date.cc
77
77
  }
78
78
 
79
79
  if (error)
80
 
    set_datetime_warning(error == 3 ? MYSQL_ERROR::WARN_LEVEL_NOTE :
81
 
                         MYSQL_ERROR::WARN_LEVEL_WARN,
 
80
    set_datetime_warning(error == 3 ? DRIZZLE_ERROR::WARN_LEVEL_NOTE :
 
81
                         DRIZZLE_ERROR::WARN_LEVEL_WARN,
82
82
                         ER_WARN_DATA_TRUNCATED,
83
83
                         from, len, DRIZZLE_TIMESTAMP_DATE, 1);
84
84
 
92
92
  if (nr < 0.0 || nr > 99991231235959.0)
93
93
  {
94
94
    int3store(ptr,(int32_t) 0);
95
 
    set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
 
95
    set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN,
96
96
                         ER_WARN_DATA_TRUNCATED, nr, DRIZZLE_TIMESTAMP_DATE);
97
97
    return 1;
98
98
  }
125
125
    error= 3;
126
126
 
127
127
  if (error)
128
 
    set_datetime_warning(error == 3 ? MYSQL_ERROR::WARN_LEVEL_NOTE :
129
 
                         MYSQL_ERROR::WARN_LEVEL_WARN,
 
128
    set_datetime_warning(error == 3 ? DRIZZLE_ERROR::WARN_LEVEL_NOTE :
 
129
                         DRIZZLE_ERROR::WARN_LEVEL_WARN,
130
130
                         error == 2 ? 
131
131
                         ER_WARN_DATA_OUT_OF_RANGE : ER_WARN_DATA_TRUNCATED,
132
132
                         nr,DRIZZLE_TIMESTAMP_DATE, 1);
153
153
      char buff[MAX_DATE_STRING_REP_LENGTH];
154
154
      String str(buff, sizeof(buff), &my_charset_latin1);
155
155
      make_date((DATE_TIME_FORMAT *) 0, ltime, &str);
156
 
      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED,
 
156
      set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED,
157
157
                           str.ptr(), str.length(), DRIZZLE_TIMESTAMP_DATE, 1);
158
158
    }
159
159
    if (!error && ltime->time_type != DRIZZLE_TIMESTAMP_DATE &&
162
162
      char buff[MAX_DATE_STRING_REP_LENGTH];
163
163
      String str(buff, sizeof(buff), &my_charset_latin1);
164
164
      make_datetime((DATE_TIME_FORMAT *) 0, ltime, &str);
165
 
      set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_NOTE,
 
165
      set_datetime_warning(DRIZZLE_ERROR::WARN_LEVEL_NOTE,
166
166
                           ER_WARN_DATA_TRUNCATED,
167
167
                           str.ptr(), str.length(), DRIZZLE_TIMESTAMP_DATE, 1);
168
168
      error= 3;
172
172
  {
173
173
    tmp=0;
174
174
    error= 1;
175
 
    set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1);
 
175
    set_warning(DRIZZLE_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_TRUNCATED, 1);
176
176
  }
177
177
  int3store(ptr,tmp);
178
178
  return error;