← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: Monty Taylor
  • Date: 2009-02-05 18:47:43 UTC
  • mfrom: (779.8.3 devel)
  • mto: This revision was merged to the branch mainline in revision 840.
  • Revision ID: mordred@inaugust.com-20090205184743-sn55g5b30qvdcy4h
Merged from me again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
1541
1541
    case Item::PARAM_ITEM:
1542
1542
         my_error(ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED, MYF(0), field_name);
1543
1543
         return true;
 
1544
         break;
1544
1545
    default:
1545
1546
      // Continue with the field creation
1546
1547
      break;
1766
1767
  case DRIZZLE_TYPE_BLOB:               return 4+portable_sizeof_char_ptr;
1767
1768
  case DRIZZLE_TYPE_ENUM:
1768
1769
  case DRIZZLE_TYPE_NEWDECIMAL:
1769
 
  case DRIZZLE_TYPE_VIRTUAL:
1770
 
    abort();
 
1770
    abort(); return 0;                          // This shouldn't happen
 
1771
  default:
 
1772
    return 0;
1771
1773
  }
1772
 
#ifndef __sun
1773
 
  return 0;
1774
 
#endif
1775
1774
}
1776
1775
 
1777
1776