Two bug fixes

BitKeeper/etc/logging_ok

@@ -15,3 +15,4 @@ heikki@hundin.mysql.fi
 jani@hynda.mysql.fi
 miguel@hegel.local
 arjen@fred.bitbike.com
+sinisa@rhols221.adsl.netsonic.fi

Docs/manual.texi

@@ -46768,6 +46768,11 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
 
 @itemize @bullet
 @item
+Fixed @code{SIGINT} and @code{SIGQUIT} problems in mysql.cc
+@item
+Fixed bug in convert.cc, which is caused by having a wrong net_store_length 
+linked in CONVERT::store method
+@item
 Multi-table @code{DELETE}.
 @item
 Don't support old client protocols prior to MySQL 3.21 any more.

readline/Makefile.am

@@ -26,7 +26,7 @@ noinst_HEADERS =	rldefs.h histlib.h rlwinsize.h \
 
 EXTRA_DIST=		emacs_keymap.c vi_keymap.c
 
-DEFS =			-DUNDEF_THREADS_HACK -DHAVE_CONFIG_H
+DEFS =			-DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

sql/convert.cc

@@ -456,7 +456,7 @@ bool CONVERT::store(String *packet,const char *from,uint length)
       packet->realloc(packet_length+5+length))
     return 1;
   char *to=(char*) net_store_length((char*) packet->ptr()+packet_length,
-				    length);
+				    (ulonglong)length);
 
   for (const char *end=from+length ; from != end ; from++)
     *to++= to_map[(uchar) *from];