mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 22:12:30 +01:00
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
This commit is contained in:
commit
2c9a16873c
2 changed files with 7 additions and 1 deletions
|
@ -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
|
||||||
%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
|
||||||
|
|
||||||
%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
|
||||||
|
|
Loading…
Reference in a new issue