Skip to content

M
mariadb
Commit 4f1f0b67 authored by unknown's avatar unknown
Browse files
Options

Bug#8861 

  Correct previous bugfix
parent 597f3dfa
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
sql/item.cc
View file @ 4f1f0b67
...@@ -3591,6 +3591,7 @@ bool Item::send(Protocol *protocol, String *buffer) ...@@ -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();
......
sql/protocol.cc
View file @ 4f1f0b67
...@@ -774,7 +774,6 @@ bool Protocol_simple::store(const char *from, uint length, ...@@ -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) ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7