diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-06 02:36:19 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-06 02:36:19 +0200 |
| commit | 509bdd372969d09f7840b004c41589c804ce75bc (patch) | |
| tree | 68e73082b59a24a1c78bca5bfbc5ae2d522517e1 /myisam | |
| parent | e5fc4bf1449fd448f2256b19661822bbff59b75e (diff) | |
| parent | 9b96c022ee48ba44f445c78698ab54d51e35a0d6 (diff) | |
| download | mariadb-git-509bdd372969d09f7840b004c41589c804ce75bc.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
myisam/mi_write.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_write.c b/myisam/mi_write.c index 1dd4820bc03..d4a17ebf19b 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -815,7 +815,7 @@ int _mi_init_bulk_insert(MI_INFO *info) } } - if (!num_keys) + if (num_keys==0 || num_keys>myisam_bulk_insert_tree_size) return 0; info->bulk_insert=(TREE *) |