bk commit into 5.0 tree (joerg:1.2196) BUG#20216

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.0 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.2196 06/06/27 20:32:08 joerg@stripped +1 -0
  Manual merge for bug#20216.

  support-files/mysql.spec.sh
    1.144 06/06/27 20:32:04 joerg@stripped +2 -4
    Manual merge for bug#20216, due to some conflict in the changenotes.

# 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:	/M50/bug20216-5.0/RESYNC

--- 1.143/support-files/mysql.spec.sh	2006-06-27 20:17:58 +02:00
+++ 1.144/support-files/mysql.spec.sh	2006-06-27 20:32:04 +02:00
@@ -588,6 +588,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
@@ -618,7 +619,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
 
@@ -724,6 +724,8 @@
 # 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.