diff options
| author | unknown <jan@hundin.mysql.fi> | 2005-01-17 09:17:48 +0200 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2005-01-17 09:17:48 +0200 |
| commit | 5a37fffdac104d0946e6c6d80750ea4d28bb9c2f (patch) | |
| tree | 97e2e483180ec3d3149e7545c27adb392730b506 /innobase/row | |
| parent | b25fcad4a7ee8c8b54610609dd989b1e8b9ce3c5 (diff) | |
| parent | ffd2ffed37c708fd1c7741edbe43dd22a93f1eee (diff) | |
| download | mariadb-git-5a37fffdac104d0946e6c6d80750ea4d28bb9c2f.tar.gz | |
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
Diffstat (limited to 'innobase/row')
| -rw-r--r-- | innobase/row/row0ins.c | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/innobase/row/row0ins.c b/innobase/row/row0ins.c index f8a98f74c09..15ffabf70cc 100644 --- a/innobase/row/row0ins.c +++ b/innobase/row/row0ins.c @@ -1105,7 +1105,6 @@ row_ins_check_foreign_constraint( dict_table_t* check_table; dict_index_t* check_index; ulint n_fields_cmp; - ibool unique_search; rec_t* rec; btr_pcur_t pcur; ibool moved; @@ -1223,14 +1222,6 @@ run_again: dtuple_set_n_fields_cmp(entry, foreign->n_fields); - if (dict_index_get_n_unique(check_index) <= foreign->n_fields) { - /* We can just set a LOCK_REC_NOT_GAP type lock */ - - unique_search = TRUE; - } else { - unique_search = FALSE; - } - btr_pcur_open(check_index, entry, PAGE_CUR_GE, BTR_SEARCH_LEAF, &pcur, &mtr); @@ -1268,17 +1259,13 @@ run_again: break; } } else { - /* Found a matching record */ + /* Found a matching record. Lock only + a record because we can allow inserts + into gaps */ - if (unique_search) { - err = row_ins_set_shared_rec_lock( - LOCK_REC_NOT_GAP, - rec, check_index, thr); - } else { - err = row_ins_set_shared_rec_lock( - LOCK_ORDINARY, - rec, check_index, thr); - } + err = row_ins_set_shared_rec_lock( + LOCK_REC_NOT_GAP, + rec, check_index, thr); if (err != DB_SUCCESS) { |