mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
MDEV#20107: rocksdb.check_ignore_unknown_options fails on OS X again
Rewrite the unportable sed/shell code in Perl.
This commit is contained in:
parent
53a3594b90
commit
8ec4aa4b6b
1 changed files with 34 additions and 6 deletions
|
@ -1,16 +1,44 @@
|
|||
# MariaDB: "xargs" is not present on windows builders.
|
||||
# we could work around this but this is not a priority.
|
||||
--source include/not_windows.inc
|
||||
|
||||
--disable_warnings
|
||||
let $MYSQLD_DATADIR= `select @@datadir`;
|
||||
let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
|
||||
let $error_log= $MYSQLTEST_VARDIR/log/my_restart.err;
|
||||
select variable_name, variable_value from information_schema.global_variables where variable_name="rocksdb_ignore_unknown_options";
|
||||
|
||||
--exec find $MYSQLD_DATADIR/#rocksdb/OPTIONS* | sort -t- -k 2 -n | tail -1 | xargs -0 -I {} -t sh -c "sed -i 's/rocksdb_version=.*/rocksdb_version=99.9.9/' {}"
|
||||
--exec find $MYSQLD_DATADIR/#rocksdb/OPTIONS* | sort -t- -k 2 -n | tail -1 | xargs -0 -I {} -t sh -c "echo hello=world>>{}"
|
||||
#
|
||||
# MariaDB: The following shell commands are not portable so we are
|
||||
# using perl instead:
|
||||
#--exec find $MYSQLD_DATADIR/#rocksdb/OPTIONS* | sort -t- -k 2 -n | tail -1 | xargs -0 -I {} -t sh -c "sed -i 's/rocksdb_version=.*/rocksdb_version=99.9.9/' {}"
|
||||
#--exec find $MYSQLD_DATADIR/#rocksdb/OPTIONS* | sort -t- -k 2 -n | tail -1 | xargs -0 -I {} -t sh -c "echo hello=world>>{}"
|
||||
|
||||
perl;
|
||||
my $path=$ENV{MYSQLTEST_VARDIR} . "/mysqld.1/data/\#rocksdb";
|
||||
opendir(my $dh, $path) || die "Can't opendir $some_dir: $!";
|
||||
my @files = grep { /^OPTIONS/ } readdir($dh);
|
||||
closedir($dh);
|
||||
|
||||
sub compare_second_as_number {
|
||||
local $aa= shift;
|
||||
local $bb= shift;
|
||||
$aa =~ s/OPTIONS-//;
|
||||
$bb =~ s/OPTIONS-//;
|
||||
return $aa <=> $bb;
|
||||
}
|
||||
|
||||
@sorted_files = sort { compare_second_as_number($a, $b); } @files;
|
||||
my $last_file= $sorted_files[-1];
|
||||
|
||||
my $contents="";
|
||||
open(my $fh, "<", "$path/$last_file") || die ("Couldn't open $path/$last_file");
|
||||
while (<$fh>) {
|
||||
$_ =~ s/rocksdb_version=.*/rocksdb_version=99.9.9/;
|
||||
$contents .= $_;
|
||||
}
|
||||
close($fh);
|
||||
$contents .= "hello=world\n";
|
||||
open(my $fh, ">", "$path/$last_file") || die("Can't open $path/$file for writing");
|
||||
print $fh $contents;
|
||||
close($fh);
|
||||
EOF
|
||||
|
||||
--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
|
||||
--shutdown_server 10
|
||||
|
|
Loading…
Reference in a new issue