Merge mysql.com:/space/my/mysql-3.23

into mysql.com:/space/my/mysql-3.23-spec

scripts/make_binary_distribution.sh

@@ -54,10 +54,13 @@ mkdir $BASE $BASE/bin $BASE/data $BASE/data/mysql $BASE/data/test \
  
 chmod o-rwx $BASE/data $BASE/data/*
 
-for i in sql/ChangeLog COPYING COPYING.LIB README Docs/INSTALL-BINARY \
-         Docs/manual.html Docs/manual.txt Docs/manual_toc.html
+for i in ChangeLog COPYING COPYING.LIB README Docs/INSTALL-BINARY \
+         LICENSE Docs/manual.html Docs/manual.txt Docs/manual_toc.html
 do
-  $CP $i $BASE
+  if [ -f $i ]
+  then
+    $CP $i $BASE
+  fi
 done
 
 for i in extra/comp_err extra/replace extra/perror extra/resolveip \

support-files/mysql.spec.sh

@@ -115,6 +115,7 @@ Summary: MySQL - server with Berkeley DB and Innodb support
 Group: Applications/Databases
 Provides: mysql-Max
 Obsoletes: mysql-Max
+Requires: MySQL = %{version}
 
 %description Max 
 Optional MySQL server binary that supports features
@@ -422,6 +423,11 @@ fi
 
 %changelog 
 
+* Tue Sep 24 2002 Lenz Grimmer <lenz@mysql.com>
+
+- MySQL-Max now requires MySQL to be the same version (to
+  avoid version mismatches e.g. mixing 3.23.xx and 4.0 packages)
+
 * Thu Jul 30 2002 Lenz Grimmer <lenz@mysql.com>
 
 - Use some more macros (mandir and infodir)