bk commit into 5.0 tree (kent:1.2577)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent.  When kent 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@stripped, 2008-02-26 18:36:06+01:00, kent@stripped +5 -0
  Makefile.am, Info.plist.sh:
    Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
  misc.m4, character_sets.m4, openssl.m4:
    Removed unneded semicolon

  config/ac-macros/character_sets.m4@stripped, 2008-02-26 18:32:08+01:00, kent@stripped +3 -3
    Removed unneded semicolon

  config/ac-macros/misc.m4@stripped, 2008-02-26 18:32:08+01:00, kent@stripped +1 -1
    Removed unneded semicolon

  config/ac-macros/openssl.m4@stripped, 2008-02-26 18:32:08+01:00, kent@stripped +2 -2
    Removed unneded semicolon

  support-files/MacOSX/Info.plist.sh@stripped, 2008-02-26 18:35:40+01:00, kent@stripped +1 -1
    Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot

  support-files/MacOSX/Makefile.am@stripped, 2008-02-26 18:35:40+01:00, kent@stripped +1 -1
    Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot

diff -Nrup a/config/ac-macros/character_sets.m4 b/config/ac-macros/character_sets.m4
--- a/config/ac-macros/character_sets.m4	2007-03-27 12:06:38 +02:00
+++ b/config/ac-macros/character_sets.m4	2008-02-26 18:32:08 +01:00
@@ -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"],
diff -Nrup a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4
--- a/config/ac-macros/misc.m4	2007-08-20 15:53:29 +02:00
+++ b/config/ac-macros/misc.m4	2008-02-26 18:32:08 +01:00
@@ -756,7 +756,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)
diff -Nrup a/config/ac-macros/openssl.m4 b/config/ac-macros/openssl.m4
--- a/config/ac-macros/openssl.m4	2006-08-14 20:16:45 +02:00
+++ b/config/ac-macros/openssl.m4	2008-02-26 18:32:08 +01:00
@@ -126,11 +126,11 @@ AC_MSG_CHECKING(for OpenSSL)
     AC_MSG_RESULT(no)
 	if test ! -z "$openssl_includes"
 	then
-		AC_MSG_ERROR(Can't have --with-openssl-includes without --with-openssl);
+		AC_MSG_ERROR(Can't have --with-openssl-includes without --with-openssl)
 	fi
 	if test ! -z "$openssl_libs"
 	then
-		AC_MSG_ERROR(Can't have --with-openssl-libs without --with-openssl);
+		AC_MSG_ERROR(Can't have --with-openssl-libs without --with-openssl)
 	fi
   fi
   AC_SUBST(openssl_libs)
diff -Nrup a/support-files/MacOSX/Info.plist.sh b/support-files/MacOSX/Info.plist.sh
--- a/support-files/MacOSX/Info.plist.sh	2005-08-15 15:44:52 +02:00
+++ b/support-files/MacOSX/Info.plist.sh	2008-02-26 18:35:40 +01:00
@@ -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>
diff -Nrup a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am
--- a/support-files/MacOSX/Makefile.am	2006-12-30 21:02:08 +01:00
+++ b/support-files/MacOSX/Makefile.am	2008-02-26 18:35:40 +01:00
@@ -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