Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge

cmd-line-utils/libedit/Makefile.am

@@ -23,10 +23,10 @@ libedit_a_DEPENDENCIES 	= 	@LIBEDIT_LOBJECTS@
 pkginclude_HEADERS =	readline/readline.h
 
 noinst_HEADERS =	chared.h el.h histedit.h key.h parse.h refresh.h sig.h \
-			sys.h tokenizer.h config.h hist.h map.h prompt.h \
-			search.h tty.h
+			sys.h tokenizer.h config.h hist.h map.h prompt.h read.h \
+			search.h tty.h libedit_term.h term.h
 
-EXTRA_DIST = makelist.sh np/unvis.c np/strlcpy.c np/vis.c np/strlcat.c np/fgetln.c
+EXTRA_DIST = makelist.sh np/unvis.c np/strlcpy.c np/vis.c np/vis.h np/strlcat.c np/fgetln.c
 
 CLEANFILES = makelist common.h emacs.h vi.h fcns.h help.h fcns.c help.c
 

sql/mysqld.cc

@@ -2687,7 +2687,7 @@ static void handle_connections_methods()
       (!have_tcpip || opt_disable_networking) &&
       !opt_enable_shared_memory)
   {
-    sql_print_error("TCP/IP,--shared-memory or --named-pipe should be configured on NT OS");
+    sql_print_error("TCP/IP, --shared-memory, or --named-pipe should be configured on NT OS");
     unireg_abort(1);				// Will not return
   }
 #endif