bk commit into 4.1 tree (msvensson:1.2177) BUG#9568

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2177 05/04/19 13:12:19 msvensson@neptunus.(none) +31 -0
  BUG#9568 mysql segfaults from CTRL-R 
   - Segfault because of passing a 64-bit pointer to 32 bit integer.
   - Add new include  config_readline.h which will calculate some new defines 
     based on what is found in config.h
   - This file was originally included in readline 4.3 as config.h.in, only the part that
      makes new defines have been moved to this file. 

  cmd-line-utils/readline/config_readline.h
    1.1 05/04/19 13:12:15 msvensson@neptunus.(none) +26 -0

  cmd-line-utils/readline/xmalloc.c
    1.5 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/vi_mode.c
    1.10 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/util.c
    1.6 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/undo.c
    1.7 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/tilde.c
    1.8 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/text.c
    1.4 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/terminal.c
    1.12 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/signals.c
    1.5 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/shell.c
    1.7 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/search.c
    1.7 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/rltty.c
    1.8 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/readline.c
    1.8 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/parens.c
    1.5 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/nls.c
    1.5 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/misc.c
    1.3 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/mbutil.c
    1.4 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/macro.c
    1.6 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/kill.c
    1.7 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/keymaps.c
    1.5 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/isearch.c
    1.8 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/input.c
    1.10 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/histsearch.c
    1.6 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/history.c
    1.6 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/histfile.c
    1.7 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/histexpand.c
    1.9 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/funmap.c
    1.7 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/display.c
    1.10 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/config_readline.h
    1.0 05/04/19 13:12:15 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug9568/cmd-line-utils/readline/config_readline.h

  cmd-line-utils/readline/complete.c
    1.10 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/callback.c
    1.6 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/bind.c
    1.12 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug9568

--- 1.11/cmd-line-utils/readline/bind.c	2005-02-01 03:19:30 +01:00
+++ 1.12/cmd-line-utils/readline/bind.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <stdio.h>
 #include <sys/types.h>

--- 1.5/cmd-line-utils/readline/callback.c	2003-01-18 17:32:52 +01:00
+++ 1.6/cmd-line-utils/readline/callback.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include "rlconf.h"
 

--- 1.9/cmd-line-utils/readline/complete.c	2003-01-18 17:32:52 +01:00
+++ 1.10/cmd-line-utils/readline/complete.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 #include <fcntl.h>

--- 1.9/cmd-line-utils/readline/display.c	2003-01-18 17:32:52 +01:00
+++ 1.10/cmd-line-utils/readline/display.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 

--- 1.6/cmd-line-utils/readline/funmap.c	2003-01-18 17:32:52 +01:00
+++ 1.7/cmd-line-utils/readline/funmap.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #if !defined (BUFSIZ)
 #include <stdio.h>

--- 1.8/cmd-line-utils/readline/histexpand.c	2003-01-18 17:32:52 +01:00
+++ 1.9/cmd-line-utils/readline/histexpand.c	2005-04-19 13:12:15 +02:00
@@ -22,9 +22,7 @@
 
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <stdio.h>
 

--- 1.6/cmd-line-utils/readline/histfile.c	2003-01-18 17:32:52 +01:00
+++ 1.7/cmd-line-utils/readline/histfile.c	2005-04-19 13:12:15 +02:00
@@ -25,9 +25,7 @@
    you can call.  I think I have done that. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <stdio.h>
 

--- 1.5/cmd-line-utils/readline/history.c	2003-01-18 17:32:52 +01:00
+++ 1.6/cmd-line-utils/readline/history.c	2005-04-19 13:12:15 +02:00
@@ -25,9 +25,7 @@
    you can call.  I think I have done that. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <stdio.h>
 

--- 1.5/cmd-line-utils/readline/histsearch.c	2003-01-18 17:32:52 +01:00
+++ 1.6/cmd-line-utils/readline/histsearch.c	2005-04-19 13:12:15 +02:00
@@ -22,9 +22,7 @@
 
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <stdio.h>
 #if defined (HAVE_STDLIB_H)

--- 1.9/cmd-line-utils/readline/input.c	2003-01-18 17:32:52 +01:00
+++ 1.10/cmd-line-utils/readline/input.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 #include <fcntl.h>

--- 1.7/cmd-line-utils/readline/isearch.c	2003-01-18 17:32:52 +01:00
+++ 1.8/cmd-line-utils/readline/isearch.c	2005-04-19 13:12:15 +02:00
@@ -26,9 +26,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 

--- 1.4/cmd-line-utils/readline/keymaps.c	2003-01-18 17:32:52 +01:00
+++ 1.5/cmd-line-utils/readline/keymaps.c	2005-04-19 13:12:15 +02:00
@@ -20,9 +20,7 @@
    Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #if defined (HAVE_STDLIB_H)
 #  include <stdlib.h>

--- 1.6/cmd-line-utils/readline/kill.c	2003-01-18 17:32:52 +01:00
+++ 1.7/cmd-line-utils/readline/kill.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 

--- 1.5/cmd-line-utils/readline/macro.c	2003-01-18 17:32:52 +01:00
+++ 1.6/cmd-line-utils/readline/macro.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 

--- 1.4/cmd-line-utils/readline/nls.c	2003-01-18 17:32:52 +01:00
+++ 1.5/cmd-line-utils/readline/nls.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 

--- 1.4/cmd-line-utils/readline/parens.c	2003-01-18 17:32:52 +01:00
+++ 1.5/cmd-line-utils/readline/parens.c	2005-04-19 13:12:15 +02:00
@@ -23,9 +23,7 @@
 
 #include "rlconf.h"
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <stdio.h>
 #include <sys/types.h>

--- 1.7/cmd-line-utils/readline/readline.c	2003-01-18 17:32:52 +01:00
+++ 1.8/cmd-line-utils/readline/readline.c	2005-04-19 13:12:15 +02:00
@@ -22,9 +22,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 #include "posixstat.h"

--- 1.7/cmd-line-utils/readline/rltty.c	2003-01-18 17:32:52 +01:00
+++ 1.8/cmd-line-utils/readline/rltty.c	2005-04-19 13:12:15 +02:00
@@ -22,9 +22,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 #include <signal.h>

--- 1.6/cmd-line-utils/readline/search.c	2003-01-18 17:32:52 +01:00
+++ 1.7/cmd-line-utils/readline/search.c	2005-04-19 13:12:15 +02:00
@@ -22,9 +22,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 #include <stdio.h>

--- 1.6/cmd-line-utils/readline/shell.c	2003-01-18 17:32:52 +01:00
+++ 1.7/cmd-line-utils/readline/shell.c	2005-04-19 13:12:15 +02:00
@@ -22,9 +22,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 

--- 1.4/cmd-line-utils/readline/signals.c	2003-01-18 17:32:52 +01:00
+++ 1.5/cmd-line-utils/readline/signals.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <stdio.h>		/* Just for NULL.  Yuck. */
 #include <sys/types.h>

--- 1.11/cmd-line-utils/readline/terminal.c	2003-01-18 17:32:52 +01:00
+++ 1.12/cmd-line-utils/readline/terminal.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 #include "posixstat.h"

--- 1.7/cmd-line-utils/readline/tilde.c	2003-01-18 17:32:52 +01:00
+++ 1.8/cmd-line-utils/readline/tilde.c	2005-04-19 13:12:15 +02:00
@@ -19,9 +19,7 @@
    along with Readline; see the file COPYING.  If not, write to the Free
    Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #if defined (HAVE_UNISTD_H)
 #  ifdef _MINIX

--- 1.6/cmd-line-utils/readline/undo.c	2003-01-18 17:32:52 +01:00
+++ 1.7/cmd-line-utils/readline/undo.c	2005-04-19 13:12:15 +02:00
@@ -22,9 +22,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 

--- 1.5/cmd-line-utils/readline/util.c	2003-01-18 17:32:52 +01:00
+++ 1.6/cmd-line-utils/readline/util.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 #include <fcntl.h>

--- 1.9/cmd-line-utils/readline/vi_mode.c	2003-01-18 17:32:52 +01:00
+++ 1.10/cmd-line-utils/readline/vi_mode.c	2005-04-19 13:12:15 +02:00
@@ -31,9 +31,7 @@
 
 #if defined (VI_MODE)
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 

--- 1.4/cmd-line-utils/readline/xmalloc.c	2003-01-18 17:32:52 +01:00
+++ 1.5/cmd-line-utils/readline/xmalloc.c	2005-04-19 13:12:15 +02:00
@@ -20,9 +20,7 @@
    Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <stdio.h>
 
--- New file ---
+++ cmd-line-utils/readline/config_readline.h	05/04/19 13:12:15
/* config-readline.h  Maintained by hand. Contains the readline specific
   parts from config.h.in in readline 4.3 */

#if defined (HAVE_CONFIG_H)
#  include <config.h>
#endif

/* Ultrix botches type-ahead when switching from canonical to
   non-canonical mode, at least through version 4.3 */
#if !defined (HAVE_TERMIOS_H) || !defined (HAVE_TCGETATTR) || defined (ultrix)
#  define TERMIOS_MISSING
#endif

#if defined (STRCOLL_BROKEN)
#  undef HAVE_STRCOLL
#endif

#if defined (__STDC__) && defined (HAVE_STDARG_H)
#  define PREFER_STDARG
#  define USE_VARARGS
#else
#  if defined (HAVE_VARARGS_H)
#    define PREFER_VARARGS
#    define USE_VARARGS
#  endif
#endif


--- 1.3/cmd-line-utils/readline/mbutil.c	2003-01-18 17:32:52 +01:00
+++ 1.4/cmd-line-utils/readline/mbutil.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #include <sys/types.h>
 #include <fcntl.h>

--- 1.2/cmd-line-utils/readline/misc.c	2003-01-18 17:32:52 +01:00
+++ 1.3/cmd-line-utils/readline/misc.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>

--- 1.3/cmd-line-utils/readline/text.c	2003-01-18 17:32:52 +01:00
+++ 1.4/cmd-line-utils/readline/text.c	2005-04-19 13:12:15 +02:00
@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
-#  include <config.h>
-#endif
+#include "config_readline.h"
 
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>