database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work

Browse Source 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
This commit is contained in:
df@pippilotta.erinye.com
2007-10-30 15:24:17 +01:00
parent 51fd4937c4 e5b809333c
commit c4ab8a9395
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
BitKeeper/triggers/pre-commit.check-case.pl Executable file
View File

@ -0,0 +1,26 @@
#!/usr/bin/perl
my $status = 0;
my $pending = $ENV{'BK_PENDING'};
exit 0 unless -f $pending;
open FI, "<", $pending || exit 0;
while(<FI>) {
my ($file, $stuff) = split /\|/, $_, 2;
next unless -f $file;
$file =~ s/^(.*)\/([^\/]*)$/$2/;
my $path = $1;
opendir DIR, $path;
my @files = sort map { lc } readdir DIR;
closedir DIR;
my %count = ();
$count{$_}++ for @files;
@files = grep { $count{$_} > 1 } keys %count;
if(@files > 0) {
print "$path/$file: duplicate file names: " . (join " ", @files) . "\n";
$status = 1;
}
}
close FI;
exit $status;

7
mysql-test/mysql-test-run.pl
View File

@ -3749,6 +3749,13 @@ sub mysqld_arguments ($$$$) {
# see BUG#28359 # see BUG#28359
mtr_add_arg($args, "%s--connect-timeout=60", $prefix); mtr_add_arg($args, "%s--connect-timeout=60", $prefix);
# When mysqld is run by a root user(euid is 0), it will fail
# to start unless we specify what user to run as. If not running
# as root it will be ignored, see BUG#30630
if (!(grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt))) {
mtr_add_arg($args, "%s--user=root");
}
if ( $opt_valgrind_mysqld ) if ( $opt_valgrind_mysqld )
{ {
mtr_add_arg($args, "%s--skip-safemalloc", $prefix); mtr_add_arg($args, "%s--skip-safemalloc", $prefix);