mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

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
sql/ha_innodb.cc:
  Auto merged
scripts/make_binary_distribution.sh:
  SCCS merged
This commit is contained in:
unknown 2005-04-13 21:24:49 +03:00
commit 3155bc81c2
4 changed files with 17 additions and 14 deletions
Show stats 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);

1
mysql-test/t/ctype_ucs_binlog.test
View file

@ -1,4 +1,5 @@
--source include/not_embedded.inc
--source include/have_ucs2.inc
#
# Check correct binlogging of UCS2 user variables (BUG#3875)

3
sql/ha_innodb.cc
View file

@ -6136,7 +6136,8 @@ ha_innobase::store_lock(
(lock_type == TL_READ_HIGH_PRIORITY && thd->in_lock_tables) ||
lock_type == TL_READ_WITH_SHARED_LOCKS ||
lock_type == TL_READ_NO_INSERT ||
thd->lex->sql_command != SQLCOM_SELECT) {
(thd->lex->sql_command != SQLCOM_SELECT
&& lock_type != TL_IGNORE)) {
/* The OR cases above are in this order:
1) MySQL is doing LOCK TABLES ... READ LOCAL, or