summaryrefslogtreecommitdiff
path: root/storage/maria/ma_test2.c
diff options
context:
space:
mode:
authorunknown <guilhem@gbichot4.local>2007-08-06 16:13:42 +0200
committerunknown <guilhem@gbichot4.local>2007-08-06 16:13:42 +0200
commitec547ae830f759aef707de5e783f075568440ec1 (patch)
treed524cb227fe9a16949ec3f44bccdeeeb64b94b7b /storage/maria/ma_test2.c
parent3d0f42a94c35eaf2f62677f618963b2af9166338 (diff)
downloadmariadb-git-ec547ae830f759aef707de5e783f075568440ec1.tar.gz
fixes of bad merge (probably). Less duplication in ma_test_recovery.
storage/maria/ma_range.c: old code, which is wrong now (key_len is now a local variable, not initialized). Fixes some problems in running ma_test2. storage/maria/ma_test2.c: keypart_map should be used instead of length (fix of bad merge probably) storage/maria/ma_test_recovery: less duplication in this script (one loop instead).
Diffstat (limited to 'storage/maria/ma_test2.c')
-rw-r--r--storage/maria/ma_test2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_test2.c b/storage/maria/ma_test2.c
index 2e3884bf6ce..e820907dccd 100644
--- a/storage/maria/ma_test2.c
+++ b/storage/maria/ma_test2.c
@@ -719,10 +719,10 @@ int main(int argc, char *argv[])
sprintf(key2,"%6d",k);
min_key.key= key;
- min_key.length= USE_WHOLE_KEY;
+ min_key.keypart_map= HA_WHOLE_KEY;
min_key.flag= HA_READ_AFTER_KEY;
max_key.key= key2;
- max_key.length= USE_WHOLE_KEY;
+ max_key.keypart_map= HA_WHOLE_KEY;
max_key.flag= HA_READ_BEFORE_KEY;
range_records= maria_records_in_range(file, 0, &min_key, &max_key);
records=0;