diff options
| author | unknown <acurtis@xiphis.org> | 2005-04-21 15:36:10 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-04-21 15:36:10 +0100 |
| commit | 4f1f0b670bf0f67b4856c9805f3a1b73c2e2915a (patch) | |
| tree | d71aae1b49a44234244c5b5c3edd8184ddae7395 /sql/protocol.cc | |
| parent | 597f3dfa25a354b829846f7969c0284b28dab206 (diff) | |
| download | mariadb-git-4f1f0b670bf0f67b4856c9805f3a1b73c2e2915a.tar.gz | |
Bug#8861
Correct previous bugfix
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index edeb78cc00b..22f1249ca28 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -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 |