bk commit into 4.1 tree (msvensson:1.2207) BUG#9954

[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.2207 05/04/26 13:43:55 msvensson@neptunus.(none) +3 -0
  Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
    - Changed makelist.sh
    - Bump up required version of autoconf
    - Use new style to init mutex in my_thr_init

  mysys/my_thr_init.c
    1.29 05/04/26 13:43:52 msvensson@neptunus.(none) +5 -0
    Use new style functions to init mutex if PTHREAD_MUTEX_ERRORCHECK_NP is not defined

  configure.in
    1.362 05/04/26 13:43:52 msvensson@neptunus.(none) +1 -1
    Bump up required AC version number so that correct version of aclocal is selected.

  cmd-line-utils/libedit/makelist.sh
    1.7 05/04/26 13:43:52 msvensson@neptunus.(none) +4 -3
    Changed file so it works also on windows cr/lf files.

# 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/bug9954

--- 1.361/configure.in	2005-04-13 19:05:00 +02:00
+++ 1.362/configure.in	2005-04-26 13:43:52 +02:00
@@ -118,7 +118,7 @@
 AC_SUBST(SAVE_CXXLDFLAGS)
 AC_SUBST(CXXLDFLAGS)
 
-AC_PREREQ(2.12)dnl		Minimum Autoconf version required.
+AC_PREREQ(2.14)dnl		Minimum Autoconf version required.
 
 #AC_ARG_PROGRAM			# Automaticly invoked by AM_INIT_AUTOMAKE
 AM_SANITY_CHECK

--- 1.28/mysys/my_thr_init.c	2004-10-22 17:44:48 +02:00
+++ 1.29/mysys/my_thr_init.c	2005-04-26 13:43:52 +02:00
@@ -73,8 +73,13 @@
 #endif
 #ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
   pthread_mutexattr_init(&my_errchk_mutexattr);
+#ifdef PTHREAD_MUTEX_ERRORCHECK_NP
   pthread_mutexattr_setkind_np(&my_errchk_mutexattr,
 			       PTHREAD_MUTEX_ERRORCHECK_NP);
+#else
+  pthread_mutexattr_settype(&my_errchk_mutexattr,
+			    PTHREAD_MUTEX_ERRORCHECK);
+#endif
 #endif
 
   pthread_mutex_init(&THR_LOCK_malloc,MY_MUTEX_INIT_FAST);

--- 1.6/cmd-line-utils/libedit/makelist.sh	2005-01-08 05:30:18 +01:00
+++ 1.7/cmd-line-utils/libedit/makelist.sh	2005-04-26 13:43:52 +02:00
@@ -68,7 +68,7 @@
 	/\(\):/ {
 	    pr = substr($2, 1, 2);
 	    if (pr == "vi" || pr == "em" || pr == "ed") {
-		name = substr($2, 1, length($2) - 3);
+		name = substr($2, 1, index($2,"(") - 1);
 #
 # XXX:	need a space between name and prototype so that -fc and -fh
 #	parsing is much easier
@@ -97,7 +97,7 @@
 	/\(\):/ {
 	    pr = substr($2, 1, 2);
 	    if (pr == "vi" || pr == "em" || pr == "ed") {
-		name = substr($2, 1, length($2) - 3);
+		name = substr($2, 1, index($2,"(") - 1);
 		uname = "";
 		fname = "";
 		for (i = 1; i <= length(name); i++) {
@@ -117,6 +117,7 @@
 		printf("      \"");
 		for (i = 2; i < NF; i++)
 		    printf("%s ", $i);
+                sub("\r", "", $i);
 		printf("%s\" },\n", $i);
 		ok = 0;
 	    }
@@ -219,7 +220,7 @@
 	/\(\):/ {
 	    pr = substr($2, 1, 2);
 	    if (pr == "vi" || pr == "em" || pr == "ed") {
-		name = substr($2, 1, length($2) - 3);
+		name = substr($2, 1, index($2, "(") - 1);
 		fname = "";
 		for (i = 1; i <= length(name); i++) {
 		    s = substr(name, i, 1);