diff options
| author | unknown <guilhem@gbichot3.local> | 2006-12-20 18:58:35 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2006-12-20 18:58:35 +0100 |
| commit | 714f3b73e513f2d12fb45e8256fa6299e60cd5a2 (patch) | |
| tree | 760f67854bfdcd407feba1aebfc7c9f3ddbccafd /storage/maria/ma_rsamepos.c | |
| parent | 8b998d1199d53baf002f6ad725fa69e4b2f6813b (diff) | |
| download | mariadb-git-714f3b73e513f2d12fb45e8256fa6299e60cd5a2.tar.gz | |
merge of recent MyISAM changes into Maria.
Only failure is ndb_restore - could have been worse!!
include/pagecache.h:
LSN->lsn
mysys/mf_keycache.c:
page_status is int
mysys/mf_pagecache.c:
merge of recent key cache changes
sql/mysqld.cc:
post-merge fixes
sql/set_var.cc:
post-merge fixes
storage/maria/ha_maria.cc:
merge of recent MyISAM changes into Maria
storage/maria/ha_maria.h:
merge of recent MyISAM changes into Maria
storage/maria/ma_close.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_create.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_delete.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_dynrec.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_ft_boolean_search.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_key.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_keycache.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_open.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_page.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_rsamepos.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_statrec.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_unique.c:
merge of recent MyISAM changes into Maria
storage/maria/maria_chk.c:
merge of recent MyISAM changes into Maria
storage/maria/maria_pack.c:
merge of recent MyISAM changes into Maria
storage/myisam/myisampack.c:
compiler warning
Diffstat (limited to 'storage/maria/ma_rsamepos.c')
| -rw-r--r-- | storage/maria/ma_rsamepos.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/ma_rsamepos.c b/storage/maria/ma_rsamepos.c index 09861c03c32..b49ef8d294a 100644 --- a/storage/maria/ma_rsamepos.c +++ b/storage/maria/ma_rsamepos.c @@ -33,7 +33,8 @@ int maria_rsame_with_pos(MARIA_HA *info, byte *record, int inx, my_off_t filepos DBUG_ENTER("maria_rsame_with_pos"); DBUG_PRINT("enter",("index: %d filepos: %ld", inx, (long) filepos)); - if (inx < -1 || (inx >= 0 && !maria_is_key_active(info->s->state.key_map, inx))) + if (inx < -1 || + (inx >= 0 && ! maria_is_key_active(info->s->state.key_map, inx))) { DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX); } |