diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-08-05 09:45:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-08-05 09:45:17 +0200 |
| commit | 928edb5a9139502abf6e1c1b1552234b39d38a78 (patch) | |
| tree | fe03d1ee611b2800c4b68aadb559bad3865f34d1 /mysys | |
| parent | 1610c4285aa2a3421cca9983360ff33e86936479 (diff) | |
| parent | fa51f70dc68fe2f3afe943e2c81fcbdb34f16cad (diff) | |
| download | mariadb-git-928edb5a9139502abf6e1c1b1552234b39d38a78.tar.gz | |
Merge branch '5.5' into 10.0
5.5 without InnoDB/XtraDB changes
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/ptr_cmp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/ptr_cmp.c b/mysys/ptr_cmp.c index a481b4d961c..6e373e98972 100644 --- a/mysys/ptr_cmp.c +++ b/mysys/ptr_cmp.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. 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 @@ -91,6 +91,7 @@ static int ptr_compare(size_t *compare_length, uchar **a, uchar **b) reg3 int length= *compare_length; reg1 uchar *first,*last; + DBUG_ASSERT(length > 0); first= *a; last= *b; while (--length) { |