diff options
| author | unknown <monty@mysql.com> | 2005-07-04 03:50:04 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-07-04 03:50:04 +0300 |
| commit | bda8f1b7cf15953cfa877cbe3f18b1e9df8d8b87 (patch) | |
| tree | 8d29892167ff9d836d0992c219bf4307f1c03b75 /mysys | |
| parent | 90949a318cb47a211245fac1ec6df6b7479d2b9c (diff) | |
| parent | 8c5e2ab462d8e6446ecf90fc886cba6a3f7705a7 (diff) | |
| download | mariadb-git-bda8f1b7cf15953cfa877cbe3f18b1e9df8d8b87.tar.gz | |
manual merge
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
strings/ctype-utf8.c:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/hash.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysys/hash.c b/mysys/hash.c index 28f8797288c..45cf7d5ff1d 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -277,9 +277,8 @@ static void movelink(HASH_LINK *array,uint find,uint next_link,uint newlink) record being compared against. RETURN - < 0 key of record < key = 0 key of record == key - > 0 key of record > key + != 0 key of record != key */ static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length) |