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

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build

Browse Source 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
This commit is contained in:
df@pippilotta.erinye.com
2007-10-30 15:39:02 +01:00
parent c836873a8f c72c86713e
commit 3c3c7d0203
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3751,6 +3751,13 @@ sub mysqld_arguments ($$$$) {
# see BUG#28359
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 )
{
mtr_add_arg($args, "%s--skip-safemalloc", $prefix);