diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2013-09-26 17:51:01 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2013-09-26 17:51:01 +0300 |
| commit | ac5d1d761adaae3200559f64b61d6ecd5b005f04 (patch) | |
| tree | 4a99c1fe5b48fc264834a7d904f2eef52a7cf0ca /mysys | |
| parent | c72126e043c42ccbc3e0e138dc3aef3950959158 (diff) | |
| download | mariadb-git-ac5d1d761adaae3200559f64b61d6ecd5b005f04.tar.gz | |
Merged revisions 3916--3921 from lp:~codership/codership-mysql/5.5-23
------------------------------------------------------------
revno: 3921
fixes bug: https://launchpad.net/bugs/1228149
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23
timestamp: Mon 2013-09-23 18:29:42 +0300
message:
References lp:1228149 - fixing typos.
------------------------------------------------------------
revno: 3920
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Fri 2013-09-20 15:43:18 +0400
message:
References lp:1201893 - remove setenv("WSREP_LOG_DIR") from ha_innodb.cc
------------------------------------------------------------
revno: 3919
tags: wsrep_23.7.6
fixes bug: https://launchpad.net/bugs/1087368
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23
timestamp: Thu 2013-09-19 06:00:43 +0300
message:
References lp:1087368 - fix to preserve the order of options in case --wsrep-new-cluster is i
n the middle of option list
------------------------------------------------------------
revno: 3918
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23\
timestamp: Wed 2013-09-18 23:22:55 +0300
message:
bumped wsrep patch version number to 7.6
------------------------------------------------------------
revno: 3917
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Wed 2013-09-18 20:11:39 +0400
message:
References lp:1218944 - wsrep_sst_rsync now recognizes log_group_home_dir
------------------------------------------------------------
revno: 3916
fixes bug: https://launchpad.net/bugs/1224775
committer: Alexey Yurchenko <alexey.yurchenko@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-09-15 21:29:57 +0300
message:
References lp:1224775 - reworked wsrep_recover to create temporary log file in $DATADIR. Plus
cleaned up that function slightly.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/mysys/default.c b/mysys/default.c index f5939acc923..8ed1a454490 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -111,15 +111,9 @@ static my_bool find_wsrep_new_cluster (int* argc, char* argv[]) { ret= TRUE; *argc -= 1; - if (*argc == i) - { // last argument, just zero it up - argv[i]= NULL; - } - else - { // not the last argument, copy the last one over and zero that up. - argv[i]= argv[*argc]; - argv[*argc]= NULL; - } + /* preserve the order of remaining arguments */ + memmove(&argv[i], &argv[i + 1], (*argc - i)*sizeof(argv[i])); + argv[*argc]= NULL; } } |