mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/M50/bug19353-5.0-2 into mysql.com:/M50/bug20216-5.0

Browse source
This commit is contained in:
joerg@mysql.com 2006-06-27 20:04:44 +02:00
commit 3300c79b07
4 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/Makefile.am
View file

@ -32,7 +32,7 @@ bin_SCRIPTS = @server_scripts@ \
mysqldumpslow \ mysqldumpslow \
mysql_explain_log \ mysql_explain_log \
mysql_tableinfo \ mysql_tableinfo \
mysql_upgrade \ mysql_upgrade_shell \
mysqld_multi \ mysqld_multi \
mysql_create_system_tables mysql_create_system_tables
@ -60,7 +60,7 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \
mysql_explain_log.sh \ mysql_explain_log.sh \
mysqld_multi.sh \ mysqld_multi.sh \
mysql_tableinfo.sh \ mysql_tableinfo.sh \
mysql_upgrade.sh \ mysql_upgrade_shell.sh \
mysqld_safe.sh \ mysqld_safe.sh \
mysql_create_system_tables.sh mysql_create_system_tables.sh
@ -89,7 +89,7 @@ CLEANFILES = @server_scripts@ \
mysqldumpslow \ mysqldumpslow \
mysql_explain_log \ mysql_explain_log \
mysql_tableinfo \ mysql_tableinfo \
mysql_upgrade \ mysql_upgrade_shell \
mysqld_multi \ mysqld_multi \
make_win_src_distribution \ make_win_src_distribution \
mysql_create_system_tables mysql_create_system_tables

2
scripts/make_binary_distribution.sh
View file

@ -134,7 +134,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \ client/mysql$BS client/mysqlshow$BS client/mysqladmin$BS \
client/mysqldump$BS client/mysqlimport$BS \ client/mysqldump$BS client/mysqlimport$BS \
client/mysqltest$BS client/mysqlcheck$BS \ client/mysqltest$BS client/mysqlcheck$BS \
client/mysqlbinlog$BS \ client/mysqlbinlog$BS client/mysql_upgrade$BS \
tests/mysql_client_test$BS \ tests/mysql_client_test$BS \
libmysqld/examples/mysql_client_test_embedded$BS \ libmysqld/examples/mysql_client_test_embedded$BS \
libmysqld/examples/mysqltest_embedded$BS \ libmysqld/examples/mysqltest_embedded$BS \

0
scripts/mysql_upgrade.sh → scripts/mysql_upgrade_shell.sh
View file

22
support-files/mysql.spec.sh
View file

@ -491,11 +491,19 @@ chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
# So ensure the server is isolated as much as possible, and start it so that # So ensure the server is isolated as much as possible, and start it so that
# passwords are not checked. # passwords are not checked.
# See the related change in the start script "/etc/init.d/mysql". # See the related change in the start script "/etc/init.d/mysql".
chmod 700 $mysql_datadir if type mktemp >/dev/null 2>&1
%{_sysconfdir}/init.d/mysql start --skip-networking --skip-grant-tables then
%{_bindir}/mysql_upgrade mysql_tmp_sockdir=`mktemp -dt`
else
PID=$$
mysql_tmp_sockdir=/tmp/mysql-$PID
( umask 077 ; mkdir $mysql_tmp_sockdir )
fi
chown %{mysqld_user}:%{mysqld_group} $mysql_tmp_sockdir
%{_sysconfdir}/init.d/mysql start --skip-networking --skip-grant-tables --socket=$mysql_tmp_sockdir/upgrade.sock
%{_bindir}/mysql_upgrade --socket=$mysql_tmp_sockdir/upgrade.sock
%{_sysconfdir}/init.d/mysql stop --skip-networking --skip-grant-tables %{_sysconfdir}/init.d/mysql stop --skip-networking --skip-grant-tables
chmod 755 $mysql_datadir rm -fr $mysql_tmp_sockdir
# Change permissions again to fix any new files. # Change permissions again to fix any new files.
chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
@ -733,6 +741,12 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %changelog
* 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> * Tue Jun 20 2006 Joerg Bruehe <joerg@mysql.com>
- To run "mysql_upgrade", we need a running server; - To run "mysql_upgrade", we need a running server;