← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: Lee Bieber
  • Date: 2010-11-08 00:56:57 UTC
  • mfrom: (1911.1.4 build)
  • Revision ID: kalebral@gmail.com-20101108005657-tvx0sxjyx29ldrh7
Merge Stewart - Fix bug 616466: auto_increment and PBMS problem - adds test case for this, can no longer reproduce the problem
Merge Stewart - fix bug 621755: blitzdb dictionary not updated after alter table
Merge Stewart - fix bug 668880: remove use of exit in archive storage engine
Merge Gustaf - replace macros functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
910
910
    case 1: return 1 << FIELDFLAG_PACK_SHIFT;
911
911
    case 2: assert(1);
912
912
    case 3: assert(1);
913
 
    case 4: return f_settype((uint32_t) DRIZZLE_TYPE_LONG);
914
 
    case 8: return f_settype((uint32_t) DRIZZLE_TYPE_LONGLONG);
 
913
    case 4: return f_settype(DRIZZLE_TYPE_LONG);
 
914
    case 8: return f_settype(DRIZZLE_TYPE_LONGLONG);
915
915
  }
916
916
  return 0;                                     // This shouldn't happen
917
917
}