bk commit into 5.1 tree (joerg:1.2221) BUG#18516

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 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
  1.2221 06/06/29 11:59:05 joerg@stripped +4 -0
  Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516).

  scripts/Makefile.am
    1.56 06/06/29 11:58:59 joerg@stripped +0 -3
    Manual merge: "ul" (the shell script is already deleted in 5.1)

  support-files/mysql.spec.sh
    1.150 06/06/29 11:53:40 joerg@trift2. +0 -0
    Auto merged

  scripts/make_binary_distribution.sh
    1.121 06/06/29 11:53:40 joerg@trift2. +0 -0
    Auto merged

  BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef
    1.5 06/06/29 11:53:39 joerg@trift2. +0 -0
    Auto merged

  BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef
    1.3.1.2 06/06/29 11:53:39 joerg@trift2. +0 -0
    Merge rename: scripts/mysql_upgrade_shell.sh ->
BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef

# 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:	/M51/bug20216-5.1/RESYNC

--- 1.120/scripts/make_binary_distribution.sh	2006-05-24 02:26:49 +02:00
+++ 1.121/scripts/make_binary_distribution.sh	2006-06-29 11:53:40 +02:00
@@ -138,7 +138,7 @@
   client/mysqlslap$BS \
   client/mysqldump$BS client/mysqlimport$BS \
   client/mysqltest$BS client/mysqlcheck$BS \
-  client/mysqlbinlog$BS \
+  client/mysqlbinlog$BS client/mysql_upgrade$BS \
   tests/mysql_client_test$BS \
   libmysqld/examples/mysql_client_test_embedded$BS \
   libmysqld/examples/mysqltest_embedded$BS \

--- 1.149/support-files/mysql.spec.sh	2006-06-28 17:34:01 +02:00
+++ 1.150/support-files/mysql.spec.sh	2006-06-29 11:53:40 +02:00
@@ -478,17 +478,7 @@
 # Initiate databases if needed
 %{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
 
-# Upgrade databases if needed
-# This must be done as database user "root", who should be password-protected,
-# but this password is not available here.
-# So ensure the server is isolated as much as possible, and start it so that
-# passwords are not checked.
-# See the related change in the start script "/etc/init.d/mysql".
-chmod 700 $mysql_datadir
-%{_sysconfdir}/init.d/mysql start --skip-networking --skip-grant-tables
-%{_bindir}/mysql_upgrade
-%{_sysconfdir}/init.d/mysql stop  --skip-networking --skip-grant-tables
-chmod 755 $mysql_datadir
+# Upgrade databases if needed would go here - but it cannot be automated yet
 
 # Change permissions again to fix any new files.
 chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
@@ -584,6 +574,7 @@
 %attr(755, root, root) %{_bindir}/mysqlbug
 %attr(755, root, root) %{_bindir}/mysqld_multi
 %attr(755, root, root) %{_bindir}/mysqld_safe
+%attr(755, root, root) %{_bindir}/mysqldumpslow
 %attr(755, root, root) %{_bindir}/mysqlhotcopy
 %attr(755, root, root) %{_bindir}/mysqltest
 %attr(755, root, root) %{_bindir}/perror
@@ -613,7 +604,6 @@
 %attr(755, root, root) %{_bindir}/mysqlbinlog
 %attr(755, root, root) %{_bindir}/mysqlcheck
 %attr(755, root, root) %{_bindir}/mysqldump
-%attr(755, root, root) %{_bindir}/mysqldumpslow
 %attr(755, root, root) %{_bindir}/mysqlimport
 %attr(755, root, root) %{_bindir}/mysqlshow
 %attr(755, root, root) %{_bindir}/mysqlslap
@@ -701,6 +691,20 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Tue Jun 27 2006 Joerg Bruehe <joerg@stripped>
+
+- move "mysqldumpslow" from the client RPM to the server RPM (bug#20216)
+
+- Revert all previous attempts to call "mysql_upgrade" during RPM upgrade,
+  there are some more aspects which need to be solved before this is possible.
+  For now, just ensure the binary "mysql_upgrade" is delivered and installed.
+
+* Thu Jun 22 2006 Joerg Bruehe <joerg@stripped>
+
+- Close a gap of the previous version by explicitly using
+  a newly created temporary directory for the socket to be used
+  in the "mysql_upgrade" operation, overriding any local setting.
+
 * Tue Jun 20 2006 Joerg Bruehe <joerg@stripped>
 
 - To run "mysql_upgrade", we need a running server;