diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-11-01 12:00:11 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-11-01 12:00:11 +0100 |
| commit | 57a267a8c00471bbe13724e7d9ba89d23acef3c2 (patch) | |
| tree | 808a9f9b165bfe034304e4974dd618eaafcdedb2 /mysys | |
| parent | bd3dc54261f10f387a03ad99ce74c3824c42e462 (diff) | |
| parent | cb86ce60b9bade5ae7712d8f3f74668208ee3fd2 (diff) | |
| download | mariadb-git-57a267a8c00471bbe13724e7d9ba89d23acef3c2.tar.gz | |
Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.
The merge is still missing a few hunks related to temporary tables and
InnoDB log file size. The associated code did not seem to exist in
10.0, so the merge of that needs more work. Until this is fixed, there
are a number of test failures as a result.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_getopt.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 15c90496047..5c7cbe7a75a 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -841,7 +841,6 @@ static int findopt(char *optpat, uint length, { uint count; const struct my_option *opt= *opt_res; - my_bool is_prefix= FALSE; DBUG_ENTER("findopt"); for (count= 0; opt->name; opt++) @@ -857,8 +856,6 @@ static int findopt(char *optpat, uint length, /* We only need to know one prev */ count= 1; *ffname= opt->name; - if (opt->name[length]) - is_prefix= TRUE; } else if (strcmp(*ffname, opt->name)) { |