diff options
| author | unknown <joerg@mysql.com> | 2006-06-29 11:59:05 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2006-06-29 11:59:05 +0200 |
| commit | 592c0059584a94430cae78cc5ffeb7f45b9f755a (patch) | |
| tree | 073a110647d9bfcbce88703192f3035e8e8fde57 /support-files | |
| parent | fa99e3471594f99ad273c8f6a899a02a2e30762f (diff) | |
| parent | b024b6c0378788ddafecdc4ace7061b724c35d9d (diff) | |
| download | mariadb-git-592c0059584a94430cae78cc5ffeb7f45b9f755a.tar.gz | |
Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516).
BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
Auto merged
scripts/Makefile.am:
Manual merge: "ul" (the shell script is already deleted in 5.1)
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 72e230da0c2..1c22fb2586b 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -478,17 +478,7 @@ chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir # 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 @@ 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 @@ -613,7 +604,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 %attr(755, root, root) %{_bindir}/mysqlslap @@ -701,6 +691,20 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %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. + +* Thu Jun 22 2006 Joerg Bruehe <joerg@mysql.com> + +- 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@mysql.com> - To run "mysql_upgrade", we need a running server; |