bk commit into 4.0 tree (1.1474)

Below is the list of changes that have just been committed into a local
4.0 repository of lenz. When lenz 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1474 03/04/25 13:02:44 lenz@xxxxxxxxx +3 -0
   - support-files/MacOSX/ReadMe.txt is now autogenerated from the manual
     instead of being an individual file to avoid redundancy

  support-files/MacOSX/Makefile.am
    1.3 03/04/25 13:02:42 lenz@xxxxxxxxx +2 -1
     - Added MacOS X ReadMe.txt to CLEANFILES now that it's being autogenerated

  Docs/Makefile.am
    1.37 03/04/25 13:02:42 lenz@xxxxxxxxx +4 -1
     - Generate the MacOS ReadMe.txt from the manual

  BitKeeper/deleted/.del-ReadMe.txt~bd880aa05a0baccd
    1.4 03/04/25 12:13:38 lenz@xxxxxxxxx +92 -77
    Delete: support-files/MacOSX/ReadMe.txt

# 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: lenz
# Host: kallisto.local
# Root: /space/my/mysql-4.0-build

--- 1.36/Docs/Makefile.am       Mon Feb 24 11:34:40 2003
+++ 1.37/Docs/Makefile.am       Fri Apr 25 13:02:42 2003
@@ -27,7 +27,7 @@
 all:                   $(targets) txt_files
 
 txt_files:             ../INSTALL-SOURCE ../COPYING ../COPYING.LIB \
-                       INSTALL-BINARY
+                       INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
 
 CLEAN_FILES:           $(BUILD_SOURCES)
        touch $(BUILD_SOURCES)
@@ -253,6 +253,9 @@
 
 ../COPYING.LIB:                mysql.info $(GT)
        perl -w $(GT) mysql.info "LGPL license" "Function Index" > $@
+
+../support-files/MacOSX/ReadMe.txt:    mysql.info $(GT)
+       perl -w $(GT) mysql.info "Mac OS X installation" "Netware installation" 
> $@
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.2/support-files/MacOSX/Makefile.am        Wed Feb 19 21:02:03 2003
+++ 1.3/support-files/MacOSX/Makefile.am        Fri Apr 25 13:02:42 2003
@@ -34,7 +34,8 @@
                Description.plist \
                StartupParameters.plist \
                postinstall \
-               preinstall
+               preinstall \
+               ReadMe.txt
 
 SUFFIXES = .sh
 

--- 1.3/support-files/MacOSX/ReadMe.txt Tue Apr 22 19:09:32 2003
+++ 1.4/BitKeeper/deleted/.del-ReadMe.txt~bd880aa05a0baccd      Fri Apr 25 
12:13:38 2003
@@ -1,79 +1,94 @@
-Installation notes for MySQL on Mac OS X
+Installing MySQL on Mac OS X
+----------------------------
 
-PLEASE READ!
+Beginning with MySQL 4.0.11, you can install MySQL on Mac OS X 10.2
+("Jaguar") using a Mac OS X `PKG' binary package instead of the binary
+tarball distribution. Please note that older versions of Mac OS X (e.g.
+10.1.x) are not supported by this package.
+
+The package is located inside a disk image (`.dmg') file, that you
+first need to mount by double-clicking its icon in the Finder. It should
+then mount the image and display its contents.
+
+*NOTE*: Before proceeding with the installation, please make sure that
+no other MySQL server is running.
+
+Please shut down all running MySQL instances before continuing by either
+using the MySQL Manager Application (on Mac OS X Server) or via
+`mysqladmin shutdown' on the command line.
+
+To actually install the MySQL PKG, double click on the package icon.
+This will launch the Mac OS Package Installer, which will guide you
+through the installation of MySQL.
+
+The Mac OS X PKG of MySQL will install itself into
+`/usr/local/mysql-<version>' and will also install a symbolic link
+`/usr/local/mysql', pointing to the new location. If a directory named
+`/usr/local/mysql' already exists, it will be renamed to
+`/usr/local/mysql.bak' first. Additionally, it will install the mysql
+grant tables by executing `mysql_install_db' after the installation.
+
+The installation layout is similar to the one of the binary
+distribution, all MySQL binaries are located in directory
+`/usr/local/mysql/bin'.  The MySQL socket will be put into
+`/etc/mysql.sock' by default.  *Note Installation layouts::.
+
+It requires a user account named `mysql' (which should exist by default
+on Mac OS X 10.2 and up).
+
+If you are running Mac OS X Server, you already have a version of MySQL
+installed:
+
+   * Mac OS X Server 10.2-10.2.2 come with MySQL 3.23.51 installed
+
+   * Mac OS X Server 10.2.3 and 10.2.4 ship with MySQL 3.23.53
+
+This manual section covers the installation of the official MySQL Mac
+OS X PKG only.  Make sure to read Apple's help about installing MySQL
+(Run the "Help View" application, select "Mac OS X Server" help, and do
+a search for "MySQL" and read the item entitled "Installing MySQL").
+
+Especially note, that the pre-installed version of MySQL on Mac OS X
+Server is being started with the command `safe_mysqld' instead of
+`mysqld_safe'.
+
+If you previously used Marc Liyanage's MySQL packages for Mac OS X from
+`http://www.entropy.ch', you can simply follow the update instructions
+for packages using the binary installation layout as given on his pages.
+
+If you are upgrading from Marc's version or from the Mac OS X Server
+version of MySQL to the official MySQL PKG, you also need to convert
+the existing MySQL privilege tables. *Note Upgrading-from-3.23::.
+
+After the installation, you can start up MySQL by running the following
+commands in a terminal window. Please note that you need to have
+administrator privileges to perform this task.
+
+     shell> cd /usr/local/mysql
+     shell> sudo ./bin/mysqld_safe
+     (Enter your password)
+     (Press CTRL+Z)
+     shell> bg
+     (Press CTRL+D to exit the shell)
+
+You should now be able to connect to the MySQL server, e.g. by running
+`/usr/local/mysql/bin/mysql'.
+
+To enable the automatic startup of MySQL on bootup, you can download
+Marc Liyanage's MySQL StartupItem from the following location:
+
+`http://www2.entropy.ch/download/mysql-startupitem.pkg.tar.gz'
+
+We plan to add a StartupItem to the official MySQL PKG in the near
+future.
+
+Please note that installing a new MySQL PKG does not remove the
+directory of an older installation - unfortunately the Mac OS X
+Installer does not yet offer the functionality required to properly
+upgrade previously installed packages. After you have copied over the
+MySQL database files from the previous version and have successfully
+started the new version, you should consider removing the old
+installation files to save up disk space.  Additionally, you should
+also remove older versions of the Package Receipt directories located
+in `/Library/Receipts/mysql-<version>.pkg'.
 
-For more details about installing and running
-MySQL on Mac OS X, also refer to the manual,
-which is available online:
-
-http://www.mysql.com/doc/en/Mac_OS_X_installation.html
-
-NOTE: Before proceeding with the installation, please
-make sure that no other MySQL server is running!
-
-Please shut down all running MySQL instances before
-continuing by either using the MySQL Manager
-Application (on Mac OS X Server) or via "mysqladmin
-shutdown" on the command line.
-
-This MySQL package will be installed into
-"/usr/local/mysql-<version>" and will also create a
-symbolic link "/usr/local/mysql", pointing to the new
-location.
-
-A previously existing /usr/local/mysql directory will
-be renamed to /usr/local/mysql.bak before proceeding
-with the installation.
-
-Additionally, it will install the mysql grant tables by
-executing "mysql_install_db" after the installation.
-
-If you are running Mac OS X Server, you already have a
-version MySQL installed. Make sure to read Apple's help
-about installing MySQL (Run the "Help View" application,
-select "Mac OS X Server help", and do a search for MySQL
-and read the item entitled "Installing MySQL").
-
-If you previously used Marc Liyanage's MySQL packages
-for MacOS X from http://www.entropy.ch, you can simply
-follow the update instructions given on his pages.
-
-After the installation (and restoring the old database
-files, if necessary), you can start up MySQL by running
-the following commands in a terminal window:
-
-  cd /usr/local/mysql
-  sudo ./bin/mysqld_safe
-  (Enter your password)
-  (Press CTRL+Z)
-  bg
-  (Press CTRL+D to exit the shell)
-
-You should now be able to connect to the MySQL server,
-e.g. by running /usr/local/mysql/bin/mysql
-
-If you installed MySQL for the first time,
-PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER!
-This is done with the following two commands:
-
-/usr/local/mysql/bin/mysqladmin -u root password 'new-password'
-
-/usr/local/mysql/bin/mysqladmin -u root -h $hostname password 'new-password'
-
-Please note, that after upgrading from MySQL 3.23 to
-MySQL 4.0 it is recommended to convert the MySQL
-privilege tables using the mysql_fix_privilege_tables
-script, since some new security privileges have been
-added.
-
-Please see
-http://www.mysql.com/doc/en/Upgrading-from-3.23.html
-for more information on how to upgrade from MySQL 3.23.
-
-If you do not want to have to type the full path
-"/usr/local/mysql/bin" in front of every command, you
-can to add this directory to your PATH environment
-variable in your login script. For the default shell
-"tcsh", you can do this by running this command once:
-
-echo 'setenv PATH ${PATH}:/usr/local/mysql/bin' >> ~/.tcshrc

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx