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 pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint

Browse Source 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
This commit is contained in:
unknown
2007-11-06 11:07:30 +01:00
parent 3acf386878 775f84186a
commit 93fdb082a2
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqltest.c
View File

@ -2670,7 +2670,7 @@ void do_copy_file(struct st_command *command)
command command handle command command handle
DESCRIPTION DESCRIPTION
chmod_file <octal> <file_name> chmod <octal> <file_name>
Change file permission of <file_name> Change file permission of <file_name>
*/ */

10
mysql-test/lib/mtr_cases.pl
View File

@ -33,16 +33,14 @@ my $skip_test;
sub init_pattern { sub init_pattern {
my ($from, $what)= @_; my ($from, $what)= @_;
if ( $from =~ /[a-z0-9]/ ) { if ( $from =~ /^[a-z0-9]$/ ) {
# Does not contain any regex, make the pattern match # Does not contain any regex, make the pattern match
# beginning of string # beginning of string
$from= "^$from"; $from= "^$from";
} }
else { # Check that pattern is a valid regex
# Check that pattern is a valid regex eval { "" =~/$from/; 1 } or
eval { "" =~/$from/; 1 } or mtr_error("Invalid regex '$from' passed to $what\nPerl says: $@");
mtr_error("Invalid regex '$from' passed to $what\nPerl says: $@");
}
return $from; return $from;
} }

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

@ -3761,6 +3761,16 @@ 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
my $euid= $>;
if (!$glob_win32 and $euid == 0 and
grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt) == 0) {
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);