diff options
| author | unknown <serg@serg.mylan> | 2006-01-03 18:12:03 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-01-03 18:12:03 +0100 |
| commit | c489cdebeabc88b394f04bf1ae91df3deff602da (patch) | |
| tree | cfc5357eb7d1e59ea0163aa88d31bcf7644151d7 /myisam/mi_delete.c | |
| parent | 5e7cbbcbbcb871432cf513c89cd5240c754cde29 (diff) | |
| parent | 307c0b77a191a428c4bfdcba42b53872aa7c917f (diff) | |
| download | mariadb-git-c489cdebeabc88b394f04bf1ae91df3deff602da.tar.gz | |
merged
myisam/mi_delete.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'myisam/mi_delete.c')
| -rw-r--r-- | myisam/mi_delete.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c index 416d951d138..2010b684300 100644 --- a/myisam/mi_delete.c +++ b/myisam/mi_delete.c @@ -276,7 +276,8 @@ static int d_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, if (subkeys == -1) { /* the last entry in sub-tree */ - _mi_dispose(info, keyinfo, root,DFLT_INIT_HITS); + if (_mi_dispose(info, keyinfo, root,DFLT_INIT_HITS)) + DBUG_RETURN(-1); /* fall through to normal delete */ } else |