Commit 592c0059 authored by unknown's avatar unknown
Browse files

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)
parents fa99e347 b024b6c0

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ 
  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 \

support-files/mysql.spec.sh

+16 −12
Original line number Diff line number Diff line
@@ -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;