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/bind.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <stdio.h>
 #include <sys/types.h>

cmd-line-utils/readline/callback.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include "rlconf.h"
 

cmd-line-utils/readline/complete.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 #include <fcntl.h>

cmd-line-utils/readline/config_readline.h

@@ -0,0 +1,26 @@
+/* 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

cmd-line-utils/readline/display.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 

cmd-line-utils/readline/funmap.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #if !defined (BUFSIZ)
 #include <stdio.h>

cmd-line-utils/readline/histexpand.c

@@ -22,9 +22,7 @@
 
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <stdio.h>
 

cmd-line-utils/readline/histfile.c

@@ -25,9 +25,7 @@
    you can call.  I think I have done that. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <stdio.h>
 

cmd-line-utils/readline/history.c

@@ -25,9 +25,7 @@
    you can call.  I think I have done that. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <stdio.h>
 

cmd-line-utils/readline/histsearch.c

@@ -22,9 +22,7 @@
 
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <stdio.h>
 #if defined (HAVE_STDLIB_H)

cmd-line-utils/readline/input.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 #include <fcntl.h>

cmd-line-utils/readline/isearch.c

@@ -26,9 +26,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 

cmd-line-utils/readline/keymaps.c

@@ -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_readline.h"
-#  include <config.h>
-#endif
 
 #if defined (HAVE_STDLIB_H)
 #  include <stdlib.h>

cmd-line-utils/readline/kill.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 

cmd-line-utils/readline/macro.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 

cmd-line-utils/readline/mbutil.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 #include <fcntl.h>

cmd-line-utils/readline/misc.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>

cmd-line-utils/readline/nls.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 

cmd-line-utils/readline/parens.c

@@ -23,9 +23,7 @@
 
 #include "rlconf.h"
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <stdio.h>
 #include <sys/types.h>

cmd-line-utils/readline/readline.c

@@ -22,9 +22,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 #include "posixstat.h"

cmd-line-utils/readline/rltty.c

@@ -22,9 +22,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 #include <signal.h>

cmd-line-utils/readline/search.c

@@ -22,9 +22,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 #include <stdio.h>

cmd-line-utils/readline/shell.c

@@ -22,9 +22,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 

cmd-line-utils/readline/signals.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <stdio.h>		/* Just for NULL.  Yuck. */
 #include <sys/types.h>

cmd-line-utils/readline/terminal.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 #include "posixstat.h"

cmd-line-utils/readline/text.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>

cmd-line-utils/readline/tilde.c

@@ -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_readline.h"
-#  include <config.h>
-#endif
 
 #if defined (HAVE_UNISTD_H)
 #  ifdef _MINIX

cmd-line-utils/readline/undo.c

@@ -22,9 +22,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 

cmd-line-utils/readline/util.c

@@ -21,9 +21,7 @@
    59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 #define READLINE_LIBRARY
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 #include <fcntl.h>

cmd-line-utils/readline/vi_mode.c

@@ -31,9 +31,7 @@
 
 #if defined (VI_MODE)
 
-#if defined (HAVE_CONFIG_H)
+#include "config_readline.h"
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 

cmd-line-utils/readline/xmalloc.c

@@ -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_readline.h"
-#include <config.h>
-#endif
 
 #include <stdio.h>