mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge from 4.1

Browse source 
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
This commit is contained in:
unknown 2005-04-13 10:38:11 -07:00
commit 9c2446f339
3 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
innobase/fil/fil0fil.c
View file

@ -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);

24
innobase/row/row0sel.c
View file

@ -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) {
goto lock_wait_or_error;
}
}
if (err != DB_SUCCESS) {
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) {
goto lock_wait_or_error;
}
}
if (err != DB_SUCCESS) {
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) {
goto lock_wait_or_error;
}
}
if (err != DB_SUCCESS) {
goto lock_wait_or_error;
}
}
btr_pcur_store_position(pcur, &mtr);