From 892879901e2243dc7436dc56912b735a39fa1acd Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 14 Mar 2003 10:35:13 -0800 Subject: [PATCH] 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 --- sql/protocol.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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,