diff options
| author | unknown <acurtis@xiphis.org> | 2005-04-21 13:34:39 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-04-21 13:34:39 +0100 |
| commit | 597f3dfa25a354b829846f7969c0284b28dab206 (patch) | |
| tree | f0a079db183be6001e94610cc2739ebd61a810b2 /sql/protocol.cc | |
| parent | da43c3cc6d2eaef41ee2c35a5b1a28d0eea80f93 (diff) | |
| parent | 62556b0023ede28e429eed345344323643f898c7 (diff) | |
| download | mariadb-git-597f3dfa25a354b829846f7969c0284b28dab206.tar.gz | |
Merge
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index dc9ab7bf795..edeb78cc00b 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -774,6 +774,7 @@ 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 && |