Commit f26a8b6f authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into narttu.mysql.fi:/my/mysql-4.0

parents a6ea34ee f88ce754
...@@ -3161,7 +3161,7 @@ sub safe_connect ...@@ -3161,7 +3161,7 @@ sub safe_connect
sub retry_connect sub retry_connect
{ {
my ($dbh, $i); my ($dbh, $i);
for (i=0 ; $i < 10 ; $i++) for ($i=0 ; $i < 10 ; $i++)
{ {
if (($dbh=DBI->connect($server->{'data_source'},$opt_user,$opt_password, if (($dbh=DBI->connect($server->{'data_source'},$opt_user,$opt_password,
{ PrintError => 0, AutoCommit => 1}))) { PrintError => 0, AutoCommit => 1})))
......
...@@ -446,6 +446,7 @@ fi ...@@ -446,6 +446,7 @@ fi
%attr(755, root, root) /usr/bin/mysql_explain_log %attr(755, root, root) /usr/bin/mysql_explain_log
%attr(755, root, root) /usr/bin/mysql_fix_privilege_tables %attr(755, root, root) /usr/bin/mysql_fix_privilege_tables
%attr(755, root, root) /usr/bin/mysql_install_db %attr(755, root, root) /usr/bin/mysql_install_db
%attr(755, root, root) /usr/bin/mysql_secure_installation
%attr(755, root, root) /usr/bin/mysql_setpermission %attr(755, root, root) /usr/bin/mysql_setpermission
%attr(755, root, root) /usr/bin/mysql_zap %attr(755, root, root) /usr/bin/mysql_zap
%attr(755, root, root) /usr/bin/mysqlbug %attr(755, root, root) /usr/bin/mysqlbug
...@@ -535,6 +536,11 @@ fi ...@@ -535,6 +536,11 @@ fi
%changelog %changelog
* Mon Mar 10 2003 Lenz Grimmer <lenz@mysql.com>
- added missing file mysql_secure_installation to server subpackage
(bug #141)
* Tue Feb 11 2003 Lenz Grimmer <lenz@mysql.com> * Tue Feb 11 2003 Lenz Grimmer <lenz@mysql.com>
- re-added missing pre- and post(un)install scripts to server subpackage - re-added missing pre- and post(un)install scripts to server subpackage
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment