← 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: 2009-02-26 05:21:02 UTC
  • mfrom: (896.1.5 fix-osxs)
  • Revision ID: brian@intel-mini-2.local-20090226052102-8xtbjt8kph6mi0qx
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
1531
1531
    case Item::PARAM_ITEM:
1532
1532
         my_error(ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED, MYF(0), field_name);
1533
1533
         return true;
1534
 
         break;
1535
1534
    default:
1536
1535
      // Continue with the field creation
1537
1536
      break;
1757
1756
  case DRIZZLE_TYPE_BLOB:               return 4+portable_sizeof_char_ptr;
1758
1757
  case DRIZZLE_TYPE_ENUM:
1759
1758
  case DRIZZLE_TYPE_NEWDECIMAL:
1760
 
    abort(); return 0;                          // This shouldn't happen
 
1759
    abort();                          // This shouldn't happen
1761
1760
  default:
1762
1761
    return 0;
1763
1762
  }