Below is the list of changes that have just been committed into a local
4.1 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:49:46+01:00, kent@stripped +2 -0
Merge mysql.com:/Users/kent/mysql/bk/lic/my40-lic
into mysql.com:/Users/kent/mysql/bk/lic/my41-lic
MERGE: 1.1346.1.851
README@stripped, 2006-11-07 22:37:57+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.4.1.5
scripts/make_binary_distribution.sh@stripped, 2006-11-07 22:49:32+01:00, kent@stripped +29 -1
MERGE: 1.49.1.16
# 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/my41-lic/RESYNC
--- 1.8/README 2006-11-07 22:50:04 +01:00
+++ 1.9/README 2006-11-07 22:50:04 +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.95/scripts/make_binary_distribution.sh 2006-11-07 22:50:04 +01:00
+++ 1.96/scripts/make_binary_distribution.sh 2006-11-07 22:50:04 +01:00
@@ -105,7 +105,7 @@
copyfileto $BASE/docs ChangeLog Docs/mysql.info
copyfileto $BASE COPYING COPYING.LIB README Docs/INSTALL-BINARY \
- EXCEPTIONS-CLIENT MySQLEULA.txt LICENSE.doc README.NW
+ EXCEPTIONS-CLIENT LICENSE.mysql
# Non platform-specific bin dir files:
BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
@@ -282,10 +282,7 @@
$BASE/support-files/build-tags \
$BASE/support-files/MySQL-shared-compat.spec \
$BASE/support-files/ndb-config-2-node.ini \
- $BASE/INSTALL-BINARY \
- $BASE/MySQLEULA.txt
-else
- rm -f $BASE/README.NW
+ $BASE/INSTALL-BINARY
fi
# Make safe_mysqld a symlink to mysqld_safe for backwards portability
| Thread |
|---|
| • bk commit into 4.1 tree (kent:1.2544) | kent | 7 Nov |
