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

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

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
This commit is contained in:
unknown 2005-01-12 23:31:31 +01:00
commit f247a0d515
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
scripts/mysqlaccess.sh
View File

@ -2,7 +2,7 @@
# **************************** # ****************************
package MySQLaccess; package MySQLaccess;
#use strict; #use strict;
use POSIX qw(tmpnam); use File::Temp qw(tempfile tmpnam);
use Fcntl; use Fcntl;
BEGIN { BEGIN {
@ -32,7 +32,6 @@ BEGIN {
$ACCESS_U_BCK = 'user_backup'; $ACCESS_U_BCK = 'user_backup';
$ACCESS_D_BCK = 'db_backup'; $ACCESS_D_BCK = 'db_backup';
$DIFF = '/usr/bin/diff'; $DIFF = '/usr/bin/diff';
$TMP_PATH = '/tmp'; #path to writable tmp-directory
$MYSQLDUMP = '@bindir@/mysqldump'; $MYSQLDUMP = '@bindir@/mysqldump';
#path to mysqldump executable #path to mysqldump executable
@ -432,7 +431,7 @@ use IPC::Open3;
# no caching on STDOUT # no caching on STDOUT
$|=1; $|=1;
$MYSQL_CNF = POSIX::tmpnam(); $MYSQL_CNF = tmpnam();
%MYSQL_CNF = (client => { }, %MYSQL_CNF = (client => { },
mysql => { }, mysql => { },
mysqldump => { }, mysqldump => { },
@ -577,8 +576,6 @@ if (!defined($Param{'host'})) { $Param{'host'}='localhost'; }
push(@MySQLaccess::Grant::Error,'not_found_mysql') if !(-x $MYSQL); push(@MySQLaccess::Grant::Error,'not_found_mysql') if !(-x $MYSQL);
push(@MySQLaccess::Grant::Error,'not_found_diff') if !(-x $DIFF); push(@MySQLaccess::Grant::Error,'not_found_diff') if !(-x $DIFF);
push(@MySQLaccess::Grant::Error,'not_found_mysqldump') if !(-x $MYSQLDUMP); push(@MySQLaccess::Grant::Error,'not_found_mysqldump') if !(-x $MYSQLDUMP);
push(@MySQLaccess::Grant::Error,'not_found_tmp') if !(-d $TMP_PATH);
push(@MySQLaccess::Grant::Error,'write_err_tmp') if !(-w $TMP_PATH);
if (@MySQLaccess::Grant::Error) { if (@MySQLaccess::Grant::Error) {
MySQLaccess::Report::Print_Error_Messages() ; MySQLaccess::Report::Print_Error_Messages() ;
exit 0; exit 0;
@ -1777,17 +1774,15 @@ sub Diff_Privileges {
@before = sort(@before); @before = sort(@before);
@after = sort(@after); @after = sort(@after);
$before = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.before.$$"; ($hb, $before) = tempfile("$MySQLaccess::script.XXXXXX") or
$after = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.after.$$"; push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!");
#$after = "/tmp/t0"; ($ha, $after) = tempfile("$MySQLaccess::script.XXXXXX") or
open(BEFORE,"> $before") || push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!");
push(@MySQLaccess::Report::Errors,"Can't open temporary file $before for writing");
open(AFTER,"> $after") || print $hb join("\n",@before);
push(@MySQLaccess::Report::Errors,"Can't open temporary file $after for writing"); print $ha join("\n",@after);
print BEFORE join("\n",@before); close $hb;
print AFTER join("\n",@after); close $ha;
close(BEFORE);
close(AFTER);
# ---------------------------------- # ----------------------------------
# compute difference # compute difference
@ -1800,8 +1795,8 @@ sub Diff_Privileges {
# ---------------------------------- # ----------------------------------
# cleanup temp. files # cleanup temp. files
unlink(BEFORE); unlink($before);
unlink(AFTER); unlink($after);
return \@diffs; return \@diffs;
} }
@ -2316,14 +2311,6 @@ BEGIN {
=> "The diff program <$MySQLaccess::DIFF> could not be found.\n" => "The diff program <$MySQLaccess::DIFF> could not be found.\n"
."+ Check your path, or\n" ."+ Check your path, or\n"
."+ edit the source of this script to point \$DIFF to the diff program.\n" ."+ edit the source of this script to point \$DIFF to the diff program.\n"
,'not_found_tmp'
=> "The temporary directory <$MySQLaccess::TMP_PATH> could not be found.\n"
."+ create this directory (writeable!), or\n"
."+ edit the source of this script to point \$TMP_PATH to the right directory.\n"
,'write_err_tmp'
=> "The temporary directory <$MySQLaccess::TMP_PATH> is not writable.\n"
."+ make this directory writeable!, or\n"
."+ edit the source of this script to point \$TMP_PATH to another directory.\n"
,'Unrecognized_option' ,'Unrecognized_option'
=> "Sorry,\n" => "Sorry,\n"
."You are using an old version of the mysql-program,\n" ."You are using an old version of the mysql-program,\n"