1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manual merge for bug#20216.

Browse Source 
support-files/mysql.spec.sh:
  Manual merge for bug#20216, due to some conflict in the changenotes.
This commit is contained in:
unknown 2006-06-27 20:32:08 +02:00
commit b024b6c037
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
support-files/mysql.spec.sh
View File

@ -588,6 +588,7 @@ fi
%attr(755, root, root) %{_bindir}/mysqlbug %attr(755, root, root) %{_bindir}/mysqlbug
%attr(755, root, root) %{_bindir}/mysqld_multi %attr(755, root, root) %{_bindir}/mysqld_multi
%attr(755, root, root) %{_bindir}/mysqld_safe %attr(755, root, root) %{_bindir}/mysqld_safe
%attr(755, root, root) %{_bindir}/mysqldumpslow
%attr(755, root, root) %{_bindir}/mysqlhotcopy %attr(755, root, root) %{_bindir}/mysqlhotcopy
%attr(755, root, root) %{_bindir}/mysqltest %attr(755, root, root) %{_bindir}/mysqltest
%attr(755, root, root) %{_bindir}/perror %attr(755, root, root) %{_bindir}/perror
@ -618,7 +619,6 @@ fi
%attr(755, root, root) %{_bindir}/mysqlbinlog %attr(755, root, root) %{_bindir}/mysqlbinlog
%attr(755, root, root) %{_bindir}/mysqlcheck %attr(755, root, root) %{_bindir}/mysqlcheck
%attr(755, root, root) %{_bindir}/mysqldump %attr(755, root, root) %{_bindir}/mysqldump
%attr(755, root, root) %{_bindir}/mysqldumpslow
%attr(755, root, root) %{_bindir}/mysqlimport %attr(755, root, root) %{_bindir}/mysqlimport
%attr(755, root, root) %{_bindir}/mysqlshow %attr(755, root, root) %{_bindir}/mysqlshow
@ -725,6 +725,8 @@ fi
%changelog %changelog
* Tue Jun 27 2006 Joerg Bruehe <joerg@mysql.com> * 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, - 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. 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. For now, just ensure the binary "mysql_upgrade" is delivered and installed.