At file:///home/psergey/bzr-new/maria-5.1-build1/ ------------------------------------------------------------ revno: 2788 revision-id: psergey@askmonty.org-20091015222833-wgpszwg9794t9cgc parent: psergey@askmonty.org-20091012165020-wy00cdvjz603quz5 committer: Sergey Petrunya <psergey@askmonty.org> branch nick: maria-5.1-build1 timestamp: Fri 2009-10-16 02:28:33 +0400 message: backport the patch: Georgi Kodinov 2009-09-17: Bug #46917: mysqd-nt installs wrong When parsing the service installation parameter in default_service_handling() make sure the value of the optional parameter doesn't overwrite it's name. === modified file 'sql/mysqld.cc' --- a/sql/mysqld.cc 2009-10-07 13:07:10 +0000 +++ b/sql/mysqld.cc 2009-10-15 22:28:33 +0000 @@ -4712,7 +4712,7 @@ if (opt_delim= strchr(extra_opt, '=')) { size_t length= ++opt_delim - extra_opt; - strnmov(pos, extra_opt, length); + pos= strnmov(pos, extra_opt, length); } else opt_delim= extra_opt;