diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2008-02-05 23:20:12 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2008-02-05 23:20:12 -0700 |
| commit | 8d5a63f0ac8afe7e63608a2384c91e1446144e9b (patch) | |
| tree | 49aa92296ee6bdfac47801e10c11a3d5674b2f05 | |
| parent | 292477d9f974bce0e628463488bbb81ce5b294ae (diff) | |
| parent | 40f2a6ae99221c329bdbe098474a01c4ad5860c7 (diff) | |
| download | mariadb-git-8d5a63f0ac8afe7e63608a2384c91e1446144e9b.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
Also use the opportunity to fix a bad merge (remove
duplicate code in mysql-test-run.pl).
mysql-test/mysql-test-run.pl:
Fix bad merge (remove duplicate code adding --user=root arg)
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 536cb873b9a..42471f35ebe 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3862,19 +3862,10 @@ sub mysqld_arguments ($$$$) { # 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"); - } - - # When mysqld is run by a root user(euid is 0), it will fail # to start unless we specify what user to run as, see BUG#30630 my $euid= $>; if (!$glob_win32 and $euid == 0 and - (grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt)) == 0) { + grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt) == 0) { mtr_add_arg($args, "%s--user=root", $prefix); } |