diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 14:11:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 14:11:02 +0200 |
| commit | c081c978a2c83b9dc9efa84414cf40232460987d (patch) | |
| tree | b625b53c941b75d122ba21d7bf650016f78c9bd5 /mysys | |
| parent | 1d21b22155242f604ab8e4a7b4ed92a422f61266 (diff) | |
| parent | a482e76e65a4fee70479e877929381c86b1ec62f (diff) | |
| download | mariadb-git-c081c978a2c83b9dc9efa84414cf40232460987d.tar.gz | |
Merge branch '5.5' into bb-10.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/errors.c | 5 | ||||
| -rw-r--r-- | mysys/mf_iocache.c | 1 | ||||
| -rw-r--r-- | mysys/my_write.c | 3 | ||||
| -rw-r--r-- | mysys/testhash.c | 4 | ||||
| -rw-r--r-- | mysys/tree.c | 3 |
5 files changed, 10 insertions, 6 deletions
diff --git a/mysys/errors.c b/mysys/errors.c index 11e7d04e79e..2d29740a689 100644 --- a/mysys/errors.c +++ b/mysys/errors.c @@ -1,6 +1,5 @@ -/* - Copyright (c) 2000, 2013, Oracle and/or its affiliates - Copyright (c) 1995, 2013, Monty Program Ab +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2009, 2016, MariaDB 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 diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 06a76c68477..f891a22b17d 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -1873,6 +1873,7 @@ void die(const char* fmt, ...) fprintf(stderr,"Error:"); vfprintf(stderr, fmt,va_args); fprintf(stderr,", errno=%d\n", errno); + va_end(va_args); exit(1); } diff --git a/mysys/my_write.c b/mysys/my_write.c index a7985997036..43735c18f0a 100644 --- a/mysys/my_write.c +++ b/mysys/my_write.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2011, 2016, MariaDB 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 diff --git a/mysys/testhash.c b/mysys/testhash.c index 3359b5dce29..96b106bec14 100644 --- a/mysys/testhash.c +++ b/mysys/testhash.c @@ -169,7 +169,9 @@ static int do_test() for (j=0 ; j < 1000 ; j++) if (key1[j] > 1) break; - if (key1[j] > 1) + // j will be 1000 only if we have no keys in the hash. This only happens + // when the parameter recant is set to 0 via command line argument. + if (j < 1000 && key1[j] > 1) { HASH_SEARCH_STATE state; printf("- Testing identical read\n"); diff --git a/mysys/tree.c b/mysys/tree.c index a9fc542faf6..ab810c64c67 100644 --- a/mysys/tree.c +++ b/mysys/tree.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. + Copyright (c) 2010, 2016, MariaDB 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 |