bk commit into 3.23 tree

[sinisa]

Below is the list of changes that have just been commited into a local
3.23. repository of sinisa. When sinisa does a push, they will be
propogaged to the main repository and within 24 hours after the push into
the public repository. For information on how to access
the public repository see
http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2002-03-28 18:35:21+02:00, sinisa@stripped
  Two bug fixes

  BitKeeper/etc/logging_ok
    1.219 02/03/28 18:33:35 sinisa@stripped +1 -0
    Logging to logging@stripped accepted

  readline/Makefile.am
    1.4 02/03/28 18:33:03 sinisa@stripped +1 -1
    Bug fix for coredump of mysql program with some Ctrl+keys

  sql/convert.cc
    1.5 02/03/28 18:33:03 sinisa@stripped +1 -1
    A bug fix for using SET CHAR... SET on columns > 64K

  Docs/manual.texi
    1.778 02/03/28 18:33:02 sinisa@stripped +5 -0
    Added text fof bug fixes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sinisa
# Host:	rhols221.adsl.netsonic.fi
# Root:	/home/sinisa/mysql

--- 1.777/Docs/manual.texi	Wed Mar 27 01:34:42 2002
+++ 1.778/Docs/manual.texi	Thu Mar 28 18:33:02 2002
@@ -46768,6 +46768,11 @@
 
 @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.

--- 1.3/readline/Makefile.am	Wed Aug 30 22:41:37 2000
+++ 1.4/readline/Makefile.am	Thu Mar 28 18:33:03 2002
@@ -26,7 +26,7 @@
 
 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.%

--- 1.4/sql/convert.cc	Wed Aug 30 22:42:20 2000
+++ 1.5/sql/convert.cc	Thu Mar 28 18:33:03 2002
@@ -456,7 +456,7 @@
       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];

--- 1.218/BitKeeper/etc/logging_ok	Tue Mar 26 23:50:09 2002
+++ 1.219/BitKeeper/etc/logging_ok	Thu Mar 28 18:33:35 2002
@@ -15,3 +15,4 @@
 jani@stripped
 miguel@stripped
 arjen@stripped
+sinisa@stripped