diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-08-01 14:56:18 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-08-01 14:56:18 +0200 |
commit | 6300f2f274bd9af0cdb599f15fbf55a66ba9ec56 (patch) | |
tree | 6db6b4551b60cdef01ea4732071bfcf3b35b6289 /mysys/ptr_cmp.c | |
parent | 96badb16afcf8a6ae3d03918419fc51ace4be236 (diff) | |
parent | 830bcff0edd3dd031932e60c7a70fe92a63fc404 (diff) | |
download | mariadb-git-6300f2f274bd9af0cdb599f15fbf55a66ba9ec56.tar.gz |
Merge tag 'mysql-5.5.45' into 5.5
Diffstat (limited to 'mysys/ptr_cmp.c')
-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) { |