diff options
| author | unknown <guilhem@gbichot4.local> | 2007-07-27 12:06:39 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2007-07-27 12:06:39 +0200 |
| commit | a3d2ae4648d739a7ec7820e22c05373fde65b770 (patch) | |
| tree | 1c7c807fa27f54c3bc16968151fcc79e1f8b4667 /include/maria.h | |
| parent | 662002fc8f6301ec78d2eca14c5f991212d4f67f (diff) | |
| download | mariadb-git-a3d2ae4648d739a7ec7820e22c05373fde65b770.tar.gz | |
merging MyISAM changes into Maria (not done in 5.1->maria merge of
Jul 7th). "maria.test" and "ps_maria.test" still fail;
"ma_test_all" starts failing (MyISAM has the same issue see BUG#30094).
include/maria.h:
merging MyISAM changes into Maria
mysys/mf_keycache.c:
mi_test_all showed "floating point exception", this was already
fixed in the latest 5.1, importing fix.
sql/item_xmlfunc.cc:
compiler warning (already fixed in latest 5.1)
storage/maria/ha_maria.cc:
merging MyISAM changes into Maria. See #ifdef ASK_MONTY.
storage/maria/ha_maria.h:
merging MyISAM changes into Maria
storage/maria/ma_cache.c:
merging MyISAM changes into Maria
storage/maria/ma_check.c:
merging MyISAM changes into Maria
storage/maria/ma_create.c:
merging MyISAM changes into Maria
storage/maria/ma_dynrec.c:
merging MyISAM changes into Maria
storage/maria/ma_extra.c:
merging MyISAM changes into Maria
storage/maria/ma_ft_boolean_search.c:
merging MyISAM changes into Maria
storage/maria/ma_ft_nlq_search.c:
merging MyISAM changes into Maria
storage/maria/ma_info.c:
merging MyISAM changes into Maria
storage/maria/ma_key.c:
merging MyISAM changes into Maria
storage/maria/ma_loghandler.c:
compiler warning (part->length is size_t)
storage/maria/ma_open.c:
merging MyISAM changes into Maria
storage/maria/ma_preload.c:
merging MyISAM changes into Maria
storage/maria/ma_range.c:
merging MyISAM changes into Maria
storage/maria/ma_rkey.c:
merging MyISAM changes into Maria
storage/maria/ma_rt_index.c:
merging MyISAM changes into Maria
storage/maria/ma_rt_key.c:
merging MyISAM changes into Maria
storage/maria/ma_rt_split.c:
merging MyISAM changes into Maria
storage/maria/ma_search.c:
merging MyISAM changes into Maria
storage/maria/ma_sort.c:
merging MyISAM changes into Maria
storage/maria/maria_def.h:
merging MyISAM changes into Maria
Diffstat (limited to 'include/maria.h')
| -rw-r--r-- | include/maria.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/maria.h b/include/maria.h index abe6463edd0..e39498149a9 100644 --- a/include/maria.h +++ b/include/maria.h @@ -265,8 +265,8 @@ extern struct st_maria_info *maria_clone(struct st_maria_share *share, int mode) extern int maria_panic(enum ha_panic_function function); extern int maria_rfirst(struct st_maria_info *file, uchar *buf, int inx); extern int maria_rkey(struct st_maria_info *file, uchar *buf, int inx, - const uchar *key, - uint key_len, enum ha_rkey_function search_flag); + const uchar *key, key_part_map keypart_map, + enum ha_rkey_function search_flag); extern int maria_rlast(struct st_maria_info *file, uchar *buf, int inx); extern int maria_rnext(struct st_maria_info *file, uchar *buf, int inx); extern int maria_rnext_same(struct st_maria_info *info, uchar *buf); |