diff options
| author | unknown <monty@mysql.com> | 2006-06-30 02:25:35 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-30 02:25:35 +0300 |
| commit | 77deeb7ee6b533f3cafac3524362cd783c79b2e8 (patch) | |
| tree | 49d31bddbb621eb2ad5dc6fdaa0e992eb7f5869a /heap | |
| parent | 3c79d36a9782523ef04e56781a555ae906258267 (diff) | |
| download | mariadb-git-77deeb7ee6b533f3cafac3524362cd783c79b2e8.tar.gz | |
Fixed include file usage
hp_test2 now works again
Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694)
heap/hp_test1.c:
Portability fix
heap/hp_test2.c:
Added max_table_size (fixes that hp_test2 works again)
include/my_global.h:
Fixed wrong cast, which caused problems with gcc 4.0 (Bug #19694)
mysys/my_handler.c:
Added missing include file
strings/strtod.c:
Fixed include files
Diffstat (limited to 'heap')
| -rw-r--r-- | heap/hp_test1.c | 3 | ||||
| -rw-r--r-- | heap/hp_test2.c | 1 |
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; |