List:Commits« Previous MessageNext Message »
From:kent Date:November 7 2006 9:26pm
Subject:bk commit into 4.0 tree (kent:1.2197)
View as plain text  
Below is the list of changes that have just been committed into a local
4.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, 2006-11-07 22:26:37+01:00, kent@stripped +3 -0
  make_binary_distribution.sh:
    Added LICENSE.mysql, removed LICENSE.doc README.NW.
    Removed obselete section about MySQLEULA.txt and README.NW.
  README:
    Added reference to the EXCEPTIONS-CLIENT file.
    Changed reference to the commercial license file.
    Corrected references into chapters in the manual.
  .del-MySQLEULA.txt~4a1afd9284f9be5a:
    Delete: Docs/MySQLEULA.txt

  BitKeeper/deleted/.del-MySQLEULA.txt~4a1afd9284f9be5a@stripped, 2006-11-07 22:12:17+01:00, kent@stripped +0 -0
    Delete: Docs/MySQLEULA.txt

  README@stripped, 2006-11-07 22:11:03+01:00, kent@stripped +7 -7
    Added reference to the EXCEPTIONS-CLIENT file.
    Changed reference to the commercial license file.
    Corrected references into chapters in the manual.

  scripts/make_binary_distribution.sh@stripped, 2006-11-07 22:18:13+01:00, kent@stripped +1 -10
    Added LICENSE.mysql, removed LICENSE.doc README.NW.
    Removed obselete section about MySQLEULA.txt and README.NW.

# 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:	kent
# Host:	c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/lic/my40-lic

--- 1.8/README	2006-11-07 22:26:46 +01:00
+++ 1.9/README	2006-11-07 22:26:46 +01:00
@@ -2,8 +2,9 @@
 MySQL is brought to you by the MySQL team at MySQL AB.
 
 License information can be found in these files:
-- For GPL (free) distributions, see the COPYING file.
-- For commercial distributions, see the MySQLEULA.txt file.
+- For GPL (free) distributions, see the COPYING file and
+  the EXCEPTIONS-CLIENT file.
+- For commercial distributions, see the LICENSE.mysql file.
 
 
 For further information about MySQL or additional documentation, see:
@@ -15,11 +16,10 @@
 - If you are migrating from an older version of MySQL, please read the
   "Upgrading from..." section first!
 - To see what MySQL can do, take a look at the features section.
-- For installation instructions, see the Installation chapter.
-- For future plans, see the TODO appendix.
-- For the new features/bugfix history, see the News appendix.
-- For the currently known bugs/misfeatures (known errors) see the problems
-  appendix.
+- For installation instructions, see the Installing and Upgrading chapter.
+- For the new features/bugfix history, see the Change History appendix.
+- For the currently known bugs/misfeatures (known errors) see the Problems
+  and Common Errors appendix.
 - For a list of developers and other contributors, see the Credits
   appendix.
 

--- 1.64/scripts/make_binary_distribution.sh	2006-11-07 22:26:46 +01:00
+++ 1.65/scripts/make_binary_distribution.sh	2006-11-07 22:26:46 +01:00
@@ -85,7 +85,7 @@
 done
 
 for i in COPYING COPYING.LIB README Docs/INSTALL-BINARY \
-         EXCEPTIONS-CLIENT MySQLEULA.txt LICENSE.doc README.NW
+         EXCEPTIONS-CLIENT LICENSE.mysql LICENSE.doc
 do
   if [ -f $i ]
   then
@@ -245,15 +245,6 @@
 
 rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh
 
-
-#
-# Remove system dependent files
-#
-if [ $BASE_SYSTEM = "netware" ] ; then
-    rm -f $BASE/MySQLEULA.txt
-else
-    rm -f $BASE/README.NW
-fi
 
 # Make safe_mysqld a symlink to mysqld_safe for backwards portability
 (cd $BASE/bin ; ln -s mysqld_safe safe_mysqld )
Thread
bk commit into 4.0 tree (kent:1.2197)kent7 Nov