Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into myvenu.com:/home/venu/work/sql/dev-4.1
This commit is contained in:
unknown 2003-03-14 10:44:08 -08:00
commit d60c11be84

View File

@ -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,