← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: Brian Aker
  • Date: 2011-01-17 16:48:48 UTC
  • mto: (2097.1.1 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2098.
  • Revision ID: brian@tangent.org-20110117164848-x0gl1pvamks5si07
Merge in namespace of enum.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
1015
1015
  char buff[40];
1016
1016
  String tmp(buff,sizeof(buff),&my_charset_bin),*res;
1017
1017
  if (!(res=val_str_internal(&tmp)) || str_to_datetime_with_warn(res->ptr(), res->length(),
1018
 
                                                                 ltime, fuzzydate) <= DRIZZLE_TIMESTAMP_ERROR)
 
1018
                                                                 ltime, fuzzydate) <= type::DRIZZLE_TIMESTAMP_ERROR)
1019
1019
  {
1020
1020
    return 1;
1021
1021
  }
1036
1036
  return 0;
1037
1037
}
1038
1038
 
1039
 
int Field::store_time(type::Time *ltime, enum enum_drizzle_timestamp_type)
 
1039
int Field::store_time(type::Time *ltime, type::timestamp_t)
1040
1040
{
1041
1041
  char buff[MAX_DATE_STRING_REP_LENGTH];
1042
1042
  uint32_t length= (uint32_t) my_TIME_to_str(ltime, buff);
1195
1195
                                 unsigned int code,
1196
1196
                                 const char *str, 
1197
1197
                                 uint32_t str_length,
1198
 
                                 enum enum_drizzle_timestamp_type ts_type, 
 
1198
                                 type::timestamp_t ts_type, 
1199
1199
                                 int cuted_increment)
1200
1200
{
1201
1201
  Session *session= table ? table->in_use : current_session;
1209
1209
void Field::set_datetime_warning(DRIZZLE_ERROR::enum_warning_level level, 
1210
1210
                                 uint32_t code,
1211
1211
                                 int64_t nr, 
1212
 
                                 enum enum_drizzle_timestamp_type ts_type,
 
1212
                                 type::timestamp_t ts_type,
1213
1213
                                 int cuted_increment)
1214
1214
{
1215
1215
  Session *session= table ? table->in_use : current_session;
1226
1226
void Field::set_datetime_warning(DRIZZLE_ERROR::enum_warning_level level,
1227
1227
                                 const uint32_t code,
1228
1228
                                 double nr, 
1229
 
                                 enum enum_drizzle_timestamp_type ts_type)
 
1229
                                 type::timestamp_t ts_type)
1230
1230
{
1231
1231
  Session *session= table ? table->in_use : current_session;
1232
1232
  if (session->really_abort_on_warning() ||