diff options
| author | unknown <venu@myvenu.com> | 2003-03-14 10:44:08 -0800 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-03-14 10:44:08 -0800 |
| commit | d60c11be844d3daa1632b0dd0320a44ca74ecffd (patch) | |
| tree | 14aa2d029e4c4b2672cb778e100bbdd35daad7c9 | |
| parent | 1aeec73192c8cd6ad7866ef5132c0fa028b48008 (diff) | |
| parent | 892879901e2243dc7436dc56912b735a39fa1acd (diff) | |
| download | mariadb-git-d60c11be844d3daa1632b0dd0320a44ca74ecffd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
| -rw-r--r-- | sql/protocol.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 6bd5c4534e9..ce2ce49dcd8 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -742,7 +742,9 @@ bool Protocol_simple::store_short(longlong from) bool Protocol_simple::store_long(longlong from) { #ifndef DEBUG_OFF - DBUG_ASSERT(field_types == 0 || field_types[field_pos++] == MYSQL_TYPE_LONG); + DBUG_ASSERT(field_types == 0 || + field_types[field_pos++] == MYSQL_TYPE_INT24 || + field_types[field_pos++] == MYSQL_TYPE_LONG); #endif char buff[20]; return net_store_data((char*) buff, |