Merge mysql.com:/home/kent/bk/build/mysql-5.0-build

into  mysql.com:/home/kent/bk/build/mysql-5.1-build

config/ac-macros/character_sets.m4

@@ -199,7 +199,7 @@ do
       ;;
     *)
       AC_MSG_ERROR([Charset '$cs' not available. (Available are: $CHARSETS_AVAILABLE).
-      See the Installation chapter in the Reference Manual.]);
+      See the Installation chapter in the Reference Manual.])
   esac
 done
 
@@ -380,7 +380,7 @@ case $default_charset in
       ;;
     *)
       AC_MSG_ERROR([Charset $cs not available. (Available are: $CHARSETS_AVAILABLE).
-      See the Installation chapter in the Reference Manual.]);
+      See the Installation chapter in the Reference Manual.])
 esac
 
 if test "$default_collation" = default; then
@@ -405,7 +405,7 @@ else
       Collation $default_collation is not valid for character set $default_charset.
       Valid collations are: $default_charset_collations.
       See the Installation chapter in the Reference Manual.
-  ]);
+  ])
 fi
 
 AC_DEFINE_UNQUOTED([MYSQL_DEFAULT_CHARSET_NAME], ["$default_charset"],

config/ac-macros/misc.m4

@@ -631,7 +631,7 @@ case $SYSTEM_TYPE in
 esac
 if test "$CXX_VERSION"
 then
-  AC_MSG_CHECKING("C++ compiler version");
+  AC_MSG_CHECKING("C++ compiler version")
   AC_MSG_RESULT("$CXX $CXX_VERSION")
 fi
 AC_SUBST(CXX_VERSION)

configure.in

@@ -23,9 +23,19 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4
-MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
-MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|\.[[^.]]*$||"`
-MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION | sed -e 's|[[^0-9.]].*$||;s|$|.|' | sed -e 's/[[^0-9.]]//g; s/\./  /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'`
+# We take some made up examples
+#
+#  VERSION                  5.1.40sp1-alpha     5.0.34a
+#  MYSQL_NO_DASH_VERSION    5.1.40sp1           5.0.34a
+#  MYSQL_NUMERIC_VERSION    5.1.40              5.0.34
+#  MYSQL_BASE_VERSION       5.1                 5.0
+#  MYSQL_VERSION_ID         50140               50034
+#
+MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|-.*$||"`
+MYSQL_NUMERIC_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|[[a-z]][[a-z0-9]]*$||"`
+MYSQL_BASE_VERSION=`echo $MYSQL_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"`
+MYSQL_VERSION_ID=`echo $MYSQL_NUMERIC_VERSION | \
+    awk -F. '{printf "%d%0.2d%0.2d", $1, $2, $3}'`
 
 # Add previous major version for debian package upgrade path
 MYSQL_PREVIOUS_BASE_VERSION=5.0

storage/ndb/src/common/util/SocketServer.cpp

@@ -112,7 +112,7 @@ SocketServer::setup(SocketServer::Service * service,
   const int on = 1;
   if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, 
 		 (const char*)&on, sizeof(on)) == -1) {
-    DBUG_PRINT("error",("getsockopt() - %d - %s",
+    DBUG_PRINT("error",("setsockopt() - %d - %s",
 			errno, strerror(errno)));
     NDB_CLOSE_SOCKET(sock);
     DBUG_RETURN(false);

support-files/MacOSX/Info.plist.sh

@@ -9,7 +9,7 @@
 	<key>CFBundleName</key>
 	<string>MySQL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>@MYSQL_NO_DASH_VERSION@</string>
+	<string>@MYSQL_NUMERIC_VERSION@</string>
 	<key>IFPkgFlagAllowBackRev</key>
 	<false/>
 	<key>IFPkgFlagAuthorizationAction</key>

support-files/MacOSX/Makefile.am

@@ -47,7 +47,7 @@ SUFFIXES = .sh
 	@SED@ \
 		-e 's!@''prefix''@!$(prefix)!g' \
 	  -e 's!@''VERSION''@!@VERSION@!' \
-	  -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
+	  -e 's!@''MYSQL_NUMERIC_VERSION''@!@MYSQL_NUMERIC_VERSION@!' \
 	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
 		-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
 	$< > $@-t