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

into myvenu.com:/home/venu/work/sql/dev-4.1

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,