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

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

Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
88df7b69 · venu@myvenu.com · 26e6fb0e · 3f7e4239 · 88df7b69
Commit 88df7b69 authored Mar 14, 2003 by venu@myvenu.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

sql/protocol.cc sql/protocol.cc +3 -1

No files found.
--- 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,