diff options
| author | unknown <serg@serg.mysql.com> | 2001-09-18 00:46:16 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-09-18 00:46:16 +0200 |
| commit | 128d1bad54c440c735a01b85ae48a7a59773ccf9 (patch) | |
| tree | 2c9dafde4d6b651e9576fe99bb281b96bfc8f911 /myisam/mi_write.c | |
| parent | d8ae9669cd11f9c61105a9cbf19f9318a0e783fc (diff) | |
| parent | e3dee590c1d97710c629556b43826478d01b7850 (diff) | |
| download | mariadb-git-128d1bad54c440c735a01b85ae48a7a59773ccf9.tar.gz | |
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
myisam/mi_write.c:
Auto merged
Diffstat (limited to 'myisam/mi_write.c')
| -rw-r--r-- | myisam/mi_write.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/myisam/mi_write.c b/myisam/mi_write.c index 5b3e8d541c7..e1b147d02e9 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -156,6 +156,17 @@ err: save_errno=my_errno; if (my_errno == HA_ERR_FOUND_DUPP_KEY || my_errno == HA_ERR_RECORD_FILE_FULL) { + if (info->bulk_insert) + { + int j; + for (j=0 ; j < share->base.keys ; j++) + { + if (is_tree_inited(& info->bulk_insert[j])) + { + reset_tree(& info->bulk_insert[j]); + } + } + } info->errkey= (int) i; while ( i-- > 0) { |