diff options
| author | unknown <jimw@mysql.com> | 2005-04-13 10:38:11 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-04-13 10:38:11 -0700 |
| commit | 9c2446f3391643e70c376660f1bbe995e5bae961 (patch) | |
| tree | e4e0f99637b8b82929900c3cd530e109ec8b0ed3 /innobase | |
| parent | 26d7574462a8abb69c55f5280d43ce15b66b3a29 (diff) | |
| parent | 338df0b77c4147315a2096f0ebd294e4009775e1 (diff) | |
| download | mariadb-git-9c2446f3391643e70c376660f1bbe995e5bae961.tar.gz | |
Merge from 4.1
innobase/fil/fil0fil.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/ctype_ucs_binlog.test:
Auto merged
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/fil/fil0fil.c | 3 | ||||
| -rw-r--r-- | innobase/row/row0sel.c | 24 |
2 files changed, 14 insertions, 13 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index 74970648c1a..af11da45319 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -1450,7 +1450,8 @@ fil_write_flushed_lsn_to_data_files( cache. Note that all data files in the system tablespace 0 are always open. */ - if (space->purpose == FIL_TABLESPACE) { + if (space->purpose == FIL_TABLESPACE + && space->id == 0) { sum_of_sizes = 0; node = UT_LIST_GET_FIRST(space->chain); diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index a43faaf8096..94cf82d6a3d 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -3493,12 +3493,12 @@ rec_loop: err = sel_set_rec_lock(rec, index, offsets, prebuilt->select_lock_type, LOCK_ORDINARY, thr); - } - - if (err != DB_SUCCESS) { + if (err != DB_SUCCESS) { - goto lock_wait_or_error; + goto lock_wait_or_error; + } } + } /* A page supremum record cannot be in the result set: skip it now that we have placed a possible lock on it */ @@ -3606,12 +3606,12 @@ rec_loop: offsets, prebuilt->select_lock_type, LOCK_GAP, thr); - } - - if (err != DB_SUCCESS) { + if (err != DB_SUCCESS) { - goto lock_wait_or_error; + goto lock_wait_or_error; + } } + } btr_pcur_store_position(pcur, &mtr); @@ -3640,12 +3640,12 @@ rec_loop: offsets, prebuilt->select_lock_type, LOCK_GAP, thr); - } + if (err != DB_SUCCESS) { - if (err != DB_SUCCESS) { - - goto lock_wait_or_error; + goto lock_wait_or_error; + } } + } btr_pcur_store_position(pcur, &mtr); |