diff options
| author | unknown <venu@myvenu.com> | 2003-03-14 10:35:13 -0800 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-03-14 10:35:13 -0800 |
| commit | bc5696e33c467d4e75d15d42bb1470099aaff399 (patch) | |
| tree | 800ae885e5a8a72a7da7eecc4d6b8fd4b840468c /sql/protocol.cc | |
| parent | eb182175fe590df195dd59686bcb0bbf7c2beace (diff) | |
| download | mariadb-git-bc5696e33c467d4e75d15d42bb1470099aaff399.tar.gz | |
Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format
(normal protocol only, prepared protocol already handles it)
sql/protocol.cc:
Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format
Diffstat (limited to 'sql/protocol.cc')
| -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, |