Bug#8861
Correct previous bugfix
This commit is contained in:
parent
597f3dfa25
commit
4f1f0b670b
@ -3591,6 +3591,7 @@ bool Item::send(Protocol *protocol, String *buffer)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case MYSQL_TYPE_SHORT:
|
case MYSQL_TYPE_SHORT:
|
||||||
|
case MYSQL_TYPE_YEAR:
|
||||||
{
|
{
|
||||||
longlong nr;
|
longlong nr;
|
||||||
nr= val_int();
|
nr= val_int();
|
||||||
|
@ -774,7 +774,6 @@ bool Protocol_simple::store(const char *from, uint length,
|
|||||||
#ifndef DEBUG_OFF
|
#ifndef DEBUG_OFF
|
||||||
DBUG_ASSERT(field_types == 0 ||
|
DBUG_ASSERT(field_types == 0 ||
|
||||||
field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
|
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_BIT ||
|
||||||
field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
|
field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
|
||||||
(field_types[field_pos] >= MYSQL_TYPE_ENUM &&
|
(field_types[field_pos] >= MYSQL_TYPE_ENUM &&
|
||||||
@ -801,6 +800,7 @@ bool Protocol_simple::store_short(longlong from)
|
|||||||
{
|
{
|
||||||
#ifndef DEBUG_OFF
|
#ifndef DEBUG_OFF
|
||||||
DBUG_ASSERT(field_types == 0 ||
|
DBUG_ASSERT(field_types == 0 ||
|
||||||
|
field_types[field_pos] == MYSQL_TYPE_YEAR ||
|
||||||
field_types[field_pos] == MYSQL_TYPE_SHORT);
|
field_types[field_pos] == MYSQL_TYPE_SHORT);
|
||||||
field_pos++;
|
field_pos++;
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user