diff options
| author | unknown <monty@tik.mysql.fi> | 2001-07-10 16:09:15 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-07-10 16:09:15 +0300 |
| commit | bfefbf8b3b05f3cefe3dda0d8e1454af7237527e (patch) | |
| tree | 70d1bba8d49381f882d2acbcf6fcaa3d6f15a284 /myisam/mi_write.c | |
| parent | 1dd0fe2e78dcdd44ca1ff444c20049678d2d12bf (diff) | |
| parent | 9914a0c8471b9ee1f041b13c11211fe277cfcd91 (diff) | |
| download | mariadb-git-bfefbf8b3b05f3cefe3dda0d8e1454af7237527e.tar.gz | |
merge
Docs/manual.texi:
Auto merged
Diffstat (limited to 'myisam/mi_write.c')
| -rw-r--r-- | myisam/mi_write.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/myisam/mi_write.c b/myisam/mi_write.c index 5624e0ac44c..085490649a8 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -770,8 +770,9 @@ int _mi_init_bulk_insert(MI_INFO *info) if (info->bulk_insert) return 0; - info->bulk_insert=(TREE *)my_malloc( - (sizeof(TREE)+sizeof(bulk_insert_param))*share->base.keys, MYF(0)); + info->bulk_insert=(TREE *) + my_malloc((sizeof(TREE)+sizeof(bulk_insert_param))*share->base.keys, + MYF(0)); if (!info->bulk_insert) return HA_ERR_OUT_OF_MEM; @@ -785,9 +786,10 @@ int _mi_init_bulk_insert(MI_INFO *info) if (!(key->flag & HA_NOSAME) && share->base.auto_key != i+1 && test(share->state.key_map & ((ulonglong) 1 << i))) { - init_tree(& info->bulk_insert[i], 0, myisam_bulk_insert_tree_size, 0, - (qsort_cmp2)keys_compare, 0, - (tree_element_free) keys_free, (void *)params); + init_tree(& info->bulk_insert[i], 0, + myisam_bulk_insert_tree_size / share->base.keys, 0, + (qsort_cmp2)keys_compare, 0, + (tree_element_free) keys_free, (void *)params); } else info->bulk_insert[i].root=0; |