← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Brian Aker
  • Date: 2011-02-14 22:31:26 UTC
  • mto: This revision was merged to the branch mainline in revision 2171.
  • Revision ID: brian@tangent.org-20110214223126-rabur7v6dz3m989p
Fix issues where int display length may be too small, and fix collation
cases around dates (which are always binary).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
1090
1090
 
1091
1091
bool Item::is_datetime()
1092
1092
{
1093
 
  switch (field_type())
1094
 
  {
1095
 
    case DRIZZLE_TYPE_TIME:
1096
 
    case DRIZZLE_TYPE_DATE:
1097
 
    case DRIZZLE_TYPE_DATETIME:
1098
 
    case DRIZZLE_TYPE_TIMESTAMP:
1099
 
    case DRIZZLE_TYPE_MICROTIME:
1100
 
      return true;
1101
 
    case DRIZZLE_TYPE_BLOB:
1102
 
    case DRIZZLE_TYPE_VARCHAR:
1103
 
    case DRIZZLE_TYPE_DOUBLE:
1104
 
    case DRIZZLE_TYPE_DECIMAL:
1105
 
    case DRIZZLE_TYPE_ENUM:
1106
 
    case DRIZZLE_TYPE_LONG:
1107
 
    case DRIZZLE_TYPE_LONGLONG:
1108
 
    case DRIZZLE_TYPE_NULL:
1109
 
    case DRIZZLE_TYPE_UUID:
1110
 
    case DRIZZLE_TYPE_BOOLEAN:
1111
 
      return false;
1112
 
  }
1113
 
 
1114
 
  assert(0);
1115
 
  abort();
 
1093
  return field::isDateTime(field_type());
1116
1094
}
1117
1095
 
1118
1096
String *Item::check_well_formed_result(String *str, bool send_error)
1219
1197
                            name, decimals, 0, unsigned_flag);
1220
1198
    break;
1221
1199
  case DRIZZLE_TYPE_NULL:
1222
 
    field= new Field_null((unsigned char*) 0, max_length, name, &my_charset_bin);
 
1200
    field= new Field_null((unsigned char*) 0, max_length, name);
1223
1201
    break;
1224
1202
  case DRIZZLE_TYPE_DATE:
1225
 
    field= new Field_date(maybe_null, name, &my_charset_bin);
 
1203
    field= new Field_date(maybe_null, name);
1226
1204
    break;
1227
1205
 
1228
1206
  case DRIZZLE_TYPE_MICROTIME:
1233
1211
    field= new field::Epoch(maybe_null, name);
1234
1212
    break;
1235
1213
  case DRIZZLE_TYPE_DATETIME:
1236
 
    field= new Field_datetime(maybe_null, name, &my_charset_bin);
 
1214
    field= new Field_datetime(maybe_null, name);
1237
1215
    break;
1238
1216
  case DRIZZLE_TYPE_TIME:
1239
 
    field= new field::Time(maybe_null, name, &my_charset_bin);
 
1217
    field= new field::Time(maybe_null, name);
1240
1218
    break;
1241
1219
  case DRIZZLE_TYPE_BOOLEAN:
1242
1220
  case DRIZZLE_TYPE_UUID: