summaryrefslogtreecommitdiff
path: root/storage/heap
diff options
context:
space:
mode:
authorkostja@bodhi.local <>2006-07-13 22:09:36 +0400
committerkostja@bodhi.local <>2006-07-13 22:09:36 +0400
commitd7845b74db59efb3bc8ffc74cbe3a3d7c5607196 (patch)
tree42abdb25b1b2f8d856888f75545406d835075a65 /storage/heap
parentf6303a8cfb6aead0681ce33eac303eed454c659d (diff)
parentf62829636b5bdec183610acfba53ca18e0dd2f98 (diff)
downloadmariadb-git-d7845b74db59efb3bc8ffc74cbe3a3d7c5607196.tar.gz
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
Diffstat (limited to 'storage/heap')
-rw-r--r--storage/heap/hp_test1.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/heap/hp_test1.c b/storage/heap/hp_test1.c
index dd696528eb8..703b39b1e2d 100644
--- a/storage/heap/hp_test1.c
+++ b/storage/heap/hp_test1.c
@@ -44,6 +44,7 @@ int main(int argc, char **argv)
get_options(argc,argv);
bzero(&hp_create_info, sizeof(hp_create_info));
+ hp_create_info.max_table_size= 1024L*1024L;
keyinfo[0].keysegs=1;
keyinfo[0].seg=keyseg;
@@ -58,7 +59,7 @@ int main(int argc, char **argv)
bzero((gptr) flags,sizeof(flags));
printf("- Creating heap-file\n");
- if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000l,10l,
+ if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000L,10L,
&hp_create_info) ||
!(file= heap_open(filename, 2)))
goto err;