Merge mysql.com:/home/my/mysql-4.1

into  mysql.com:/home/my/mysql-5.0

2 files changed, 3 insertions, 1 deletions

diff --git a/heap/hp_test1.c b/heap/hp_test1.c
index dd696528eb8..1efa97842c7 100644
--- a/heap/hp_test1.c
+++ b/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,101L,
 		  &hp_create_info) ||
       !(file= heap_open(filename, 2)))
     goto err;
diff --git a/heap/hp_test2.c b/heap/hp_test2.c
index 2de49bcb66b..ff07b402f4d 100644
--- a/heap/hp_test2.c
+++ b/heap/hp_test2.c
@@ -74,6 +74,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;
 
   write_count=update=opt_delete=0;
   key_check=0;