summaryrefslogtreecommitdiff
path: root/mysql-test/lib/My/SafeProcess/safe_process_win.cc
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2011-01-27 14:42:08 +0100
committerBjorn Munch <bjorn.munch@oracle.com>2011-01-27 14:42:08 +0100
commit215efed133075d3d815fffa741ff8bb45b631e4e (patch)
tree11f07df1693583c8bc8424db7032f2ca2d8db580 /mysql-test/lib/My/SafeProcess/safe_process_win.cc
parent4bc23a061cef249c36fa6564a2efb1bc7939ba18 (diff)
downloadmariadb-git-215efed133075d3d815fffa741ff8bb45b631e4e.tar.gz
Bug #59489 Enable setting of env. variables for mysqld from mtr
Added --mysqld-env option, propagate via safe_process Simplified: should be safe to set in parent safe_process after it's started Addendum: catch cases of --mysqld-env w/o value, assume env.var name never begins with "--"
Diffstat (limited to 'mysql-test/lib/My/SafeProcess/safe_process_win.cc')
-rw-r--r--mysql-test/lib/My/SafeProcess/safe_process_win.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/lib/My/SafeProcess/safe_process_win.cc b/mysql-test/lib/My/SafeProcess/safe_process_win.cc
index 50e16ff25d4..7e0ae68b4de 100644
--- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc
+++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -220,6 +220,10 @@ int main(int argc, const char** argv )
{
nocore= TRUE;
}
+ else if ( strncmp (arg, "--env ", 6) == 0 )
+ {
+ putenv(strdup(arg+6));
+ }
else
die("Unknown option: %s", arg);
}