Commit 4f1f0b67 authored by unknown's avatar unknown
Browse files

Bug#8861 

  Correct previous bugfix
parent 597f3dfa

sql/item.cc

+1 −0
Original line number Diff line number Diff line
@@ -3591,6 +3591,7 @@ bool Item::send(Protocol *protocol, String *buffer) 
    break;

  }

  case MYSQL_TYPE_SHORT:

  case MYSQL_TYPE_YEAR:

  {

    longlong nr;

    nr= val_int();

sql/protocol.cc

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,6 @@ bool Protocol_simple::store(const char *from, uint length, 
#ifndef DEBUG_OFF

  DBUG_ASSERT(field_types == 0 ||

	      field_types[field_pos] == MYSQL_TYPE_DECIMAL ||

              field_types[field_pos] == MYSQL_TYPE_YEAR ||

              field_types[field_pos] == MYSQL_TYPE_BIT ||

              field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||

	      (field_types[field_pos] >= MYSQL_TYPE_ENUM &&
@@ -801,6 +800,7 @@ bool Protocol_simple::store_short(longlong from) 
{

#ifndef DEBUG_OFF

  DBUG_ASSERT(field_types == 0 ||

	      field_types[field_pos] == MYSQL_TYPE_YEAR ||

	      field_types[field_pos] == MYSQL_TYPE_SHORT);

  field_pos++;

#endif