diff options
| author | unknown <serg@serg.mysql.com> | 2002-06-20 00:55:06 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-06-20 00:55:06 +0000 |
| commit | b043f9233c1b1fa56d99cc3e503a985bd876b687 (patch) | |
| tree | 43061efc1a2e3133b918b0781d0834c651e539a1 /myisam/mi_write.c | |
| parent | ccf18acc242f33fffca016c1e28c99e6e4e443b7 (diff) | |
| parent | cf7be403f323a0d38cf23ffa46d5dcdbfeb38a8f (diff) | |
| download | mariadb-git-b043f9233c1b1fa56d99cc3e503a985bd876b687.tar.gz | |
resolving
include/my_sys.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysys/mf_iocache.c:
Auto merged
include/myisam.h:
post-merge
myisam/mi_write.c:
post-merge
Diffstat (limited to 'myisam/mi_write.c')
| -rw-r--r-- | myisam/mi_write.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/myisam/mi_write.c b/myisam/mi_write.c index 7398ec07ae2..9998a25a96a 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -823,7 +823,8 @@ int _mi_init_bulk_insert(MI_INFO *info) } } - if (num_keys==0 || num_keys > myisam_bulk_insert_tree_size) + if (num_keys==0 || + num_keys * MI_MIN_SIZE_BULK_INSERT_TREE > myisam_bulk_insert_tree_size) DBUG_RETURN(0); info->bulk_insert=(TREE *) |