diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-09-18 16:19:58 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-09-18 16:19:58 +0300 |
| commit | 5080092322817d76c0962f196dc967867e07b20d (patch) | |
| tree | 7a41e11165e562e991d2476c672340fbbdb2e735 /sql | |
| parent | 01e5bc703d91e5d39b9f00b8eb31d563a2cf6b40 (diff) | |
| parent | 31809edc24b2d6ee6b4a9932d5af0b2247ecf8dc (diff) | |
| download | mariadb-git-5080092322817d76c0962f196dc967867e07b20d.tar.gz | |
automerge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3f536f01094..3a8ecaf4439 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4604,7 +4604,7 @@ default_service_handling(char **argv, 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; |