bk commit into 4.0 tree (joerg:1.2201)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
4.0 repository of joerg. When joerg 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, 2007-01-08 18:33:55+01:00, joerg@trift2. +2 -0
  Changes necessary to build version 4.0.28:
  
  - "make_binary_distribution" accepts a dummy "--platform=" argument.
  
  - "MySQL-shared-compat.spec" uses a "version40" define symbol internally.

  scripts/make_binary_distribution.sh@stripped, 2007-01-08 18:33:54+01:00, joerg@trift2. +1 -0
    Newer versions of the release build tools call this with a "--platform=" argument
    which we seem not to need in 4.0, but which makes the tool crash (happened on SCO).
    
    Rather than add another version check into the build tools, just accept a "--platform="
    argument and ignore it, just give a message.

  support-files/MySQL-shared-compat.spec.sh@stripped, 2007-01-08 18:33:54+01:00, joerg@trift2. +5 -5
    The current version of "Do-shared-compat" needs two digits to identify the release families
    (to differ between 4.0 and 4.1), so the variable "version4" must get renamed to "version40".

# 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:	joerg
# Host:	trift2.
# Root:	/MySQL/M40/clone-4.0

--- 1.65/scripts/make_binary_distribution.sh	2007-01-08 18:33:57 +01:00
+++ 1.66/scripts/make_binary_distribution.sh	2007-01-08 18:33:57 +01:00
@@ -27,6 +27,7 @@
       --suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
       --no-strip) STRIP=0 ;;
       --machine=*)  MACHINE=`echo "$arg" | sed -e "s;--machine=;;"` ;;
+      --platform=*)  echo "Ignoring argument '$arg', continuing" ;;
       --silent)   SILENT=1 ;;
       *)
 	echo "Unknown argument '$arg'"

--- 1.4/support-files/MySQL-shared-compat.spec.sh	2007-01-08 18:33:57 +01:00
+++ 1.5/support-files/MySQL-shared-compat.spec.sh	2007-01-08 18:33:57 +01:00
@@ -26,7 +26,7 @@
 #
 # Change this to match the version of the shared libs you want to include
 #
-%define version4 @MYSQL_NO_DASH_VERSION@
+%define version40 @MYSQL_NO_DASH_VERSION@
 %define version3 3.23.58
 
 Name:         MySQL-shared-compat
@@ -36,13 +36,13 @@
 Group:        Applications/Databases
 URL:          http://www.mysql.com/
 Autoreqprov:  on
-Version:      %{version4}
+Version:      %{version40}
 Release:      0
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Obsoletes:    MySQL-shared, mysql-shared
 Provides:     MySQL-shared
-Summary:      MySQL shared libraries for MySQL %{version4} and %{version3}
-Source0:      MySQL-shared-%{version4}-0.%{_arch}.rpm
+Summary:      MySQL shared libraries for MySQL %{version40} and %{version3}
+Source0:      MySQL-shared-%{version40}-0.%{_arch}.rpm
 Source1:      MySQL-shared-%{version3}-1.%{_arch}.rpm
 # No need to include the RPMs once more - they can be downloaded seperately
 # if you want to rebuild this package
@@ -52,7 +52,7 @@
 
 %description
 This package includes the shared libraries for both MySQL %{version3} and
-MySQL %{version4}. Install this package instead of "MySQL-shared", if you 
+MySQL %{version40}. Install this package instead of "MySQL-shared", if you 
 have applications installed that are dynamically linked against MySQL
 3.23.xx but you want to upgrade to MySQL 4.0.xx without breaking the library
 dependencies.