diff options
| author | unknown <joerg@mysql.com> | 2006-06-27 20:32:08 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2006-06-27 20:32:08 +0200 |
| commit | b024b6c0378788ddafecdc4ace7061b724c35d9d (patch) | |
| tree | 507b2382f06fa943a774aa366b6925a585569543 /support-files | |
| parent | 0604daa4c7f173eba5662df6aaaebf39dae6f964 (diff) | |
| parent | 30b1d6585632123a4fb637337109a7336e558406 (diff) | |
| download | mariadb-git-b024b6c0378788ddafecdc4ace7061b724c35d9d.tar.gz | |
Manual merge for bug#20216.
support-files/mysql.spec.sh:
Manual merge for bug#20216, due to some conflict in the changenotes.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 9f08d9330d4..fd92c2bd25e 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -588,6 +588,7 @@ fi %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 @@ fi %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 @@ -725,6 +725,8 @@ fi %changelog * Tue Jun 27 2006 Joerg Bruehe <joerg@mysql.com> +- 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. |