1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge of patch for Bug#13741677 from mysql-5.1.

Browse Source
This commit is contained in:
Nirbhay Choubey 2012-07-26 21:59:05 +05:30
commit 0f532388d2
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/mysql_secure_installation.pl.in
View File

@ -1,7 +1,7 @@
#!/usr/bin/perl #!/usr/bin/perl
# -*- cperl -*- # -*- cperl -*-
# #
# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -28,7 +28,7 @@ my $mysql; # How to call the mysql client
my $rootpass = ""; my $rootpass = "";
$SIG{QUIT} = $SIG{INT} = sub { $SIG{QUIT} = $SIG{INT} = $SIG{TERM} = $SIG{ABRT} = $SIG{HUP} = sub {
print "\nAborting!\n\n"; print "\nAborting!\n\n";
echo_on(); echo_on();
cleanup(); cleanup();
@ -242,7 +242,11 @@ sub reload_privilege_tables {
} }
sub cleanup { sub cleanup {
unlink($config,$command); print "Cleaning up...\n";
foreach my $file ($config, $command) {
unlink $file or warn "Warning: Could not unlink $file: $!\n";
}
} }

18
scripts/mysql_secure_installation.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -19,7 +19,7 @@ config=".my.cnf.$$"
command=".mysql.$$" command=".mysql.$$"
mysql_client="" mysql_client=""
trap "interrupt" 2 trap "interrupt" 1 2 3 6 15
rootpass="" rootpass=""
echo_n= echo_n=
@ -139,13 +139,16 @@ set_root_password() {
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Password updated successfully!" echo "Password updated successfully!"
echo "Reloading privilege tables.." echo "Reloading privilege tables.."
reload_privilege_tables || exit 1 reload_privilege_tables
if [ $? -eq 1 ]; then
clean_and_exit
fi
echo echo
rootpass=$password1 rootpass=$password1
make_config make_config
else else
echo "Password update failed!" echo "Password update failed!"
exit 1 clean_and_exit
fi fi
return 0 return 0
@ -157,7 +160,7 @@ remove_anonymous_users() {
echo " ... Success!" echo " ... Success!"
else else
echo " ... Failed!" echo " ... Failed!"
exit 1 clean_and_exit
fi fi
return 0 return 0
@ -217,6 +220,11 @@ cleanup() {
rm -f $config $command rm -f $config $command
} }
# Remove the files before exiting.
clean_and_exit() {
cleanup
exit 1
}
# The actual script starts here # The actual script starts here