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

into mysql.com:/data0/mysqldev/my/mysql-4.1-build

cmd-line-utils/libedit/makelist.sh

@@ -87,7 +87,7 @@ case $FLAG in
     cat $FILES | $AWK '
 	BEGIN {
 	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#include \"sys.h\"\n#include \"el.h\"\n");
+	    printf("#include \"config.h\"\n#include \"el.h\"\n");
 	    printf("private const struct el_bindings_t el_func_help[] = {\n");
 	    low = "abcdefghijklmnopqrstuvwxyz_";
 	    high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
@@ -170,7 +170,7 @@ case $FLAG in
     cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK '
 	BEGIN {
 	    printf("/* Automatically generated file, do not edit */\n");
-	    printf("#include \"sys.h\"\n#include \"el.h\"\n");
+	    printf("#include \"config.h\"\n#include \"el.h\"\n");
 	    printf("private const el_func_t el_func[] = {");
 	    maxlen = 80;
 	    needn = 1;

cmd-line-utils/libedit/readline.c

@@ -70,10 +70,10 @@ extern char *alloca ();
 #include <fcntl.h>
 #include <vis.h>
 
+#include "readline/readline.h"
 #include "el.h"
 #include "fcns.h"		/* for EL_NUM_FCNS */
 #include "histedit.h"
-#include "readline/readline.h"
 
 /* for rl_complete() */
 #define TAB		'\r'

cmd-line-utils/libedit/search.c

@@ -37,6 +37,7 @@
 /*
  * search.c: History and character search functions
  */
+#include <sys/types.h>
 #include <stdlib.h>
 #if defined(REGEX)
 #include <regex.h>

configure.in

@@ -1884,6 +1884,7 @@ fi
 fi
 AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
 AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])
+AC_CHECK_TYPES([u_int32_t])
 
 MYSQL_PTHREAD_YIELD