Last commit made on 2022-06-30
Get this branch:
git clone -b bb-10.4-thiru

Branch merges

Branch information


Recent commits


MDEV-28919 Assertion `(((core_null) + 7) >> 3) == oindex.n_core_null_bytes || !not_redundant()' failed

- In case of discarded tablespace, InnoDB can't read the root page to
assign the n_core_null_bytes. Consecutive instant DDL fails because
of non-matching n_core_null_bytes.

d89cac0... by midenok

MDEV-28567 MDL debug logging

Log MDL state transitions. Trace-friendly message
format. DBUG_LOCK_FILE replaced by thread-local storage.

Logged states legend:
  Seized lock was acquired without waiting
  Waiting lock is waiting
  Acquired lock was acquired after waiting
  Released lock was released
  Deadlock lock was aborted due to deadlock
  Timeout lock was aborted due to timeout >0
  Nowait lock was aborted due to zero timeout
  Killed lock was aborted due to kill message
  OOM can not acquire because out of memory

  mtr --mysqld=--debug=d,mdl,query:i:o,/tmp/mdl.log

Cleanup from garbage messages:
  sed -i -re \
  '/(mysql|performance_schema|sys|mtr)\// d; /MDL_BACKUP_/ d' \

dbd5627... by Nayuta Yanagisawa

MDEV-24343 Spider Left join failed Unknown column 't0.ID' in 'on clause'

The Spider mixes the comma join with other join types, and thus
ERROR 1054 occurs. This is well-known issue caused by the higher
precedence of JOIN over the comma (,).

We can fix the problem simply by using JOINs instead of commas.

b922ae5... by Marko Mäkelä

Merge 10.3 into 10.4

f339ef3... by Marko Mäkelä

MDEV-26577 InnoDB: Failing assertion: dict_tf2_is_valid(flags, flags2) during ADD COLUMN

prepare_inplace_alter_table_dict(): If the table will not be rebuilt,
preserve all of the original ROW_FORMAT, including the compressed
page size flags related to ROW_FORMAT=COMPRESSED.

a75ad73... by Marko Mäkelä

MDEV-28389 fixup: Fix compiler warnings

hex_to_ascii(): Add #if around the definition to avoid
clang -Wunused-function. Avoid GCC 5 -Wconversion with a cast.

dd7e9fb... by Marko Mäkelä

MDEV-28854 after-merge fix: Remove a test for MDEV-26583

01d7570... by Marko Mäkelä

Merge 10.3 into 10.4

c86b138... by Marko Mäkelä

MDEV-28389: Simplify the InnoDB corrupted page output

buf_page_print(): Dump the buffer page 32 bytes (64 hexadecimal digits)
per line. In this way, the limitation in mtr
("Data too long for column 'line'") will not be triggered.

Also, do not bother decoding the page contents, because everything
is present in the hexadecimal output.

dict_index_find_on_id_low(): Merge to dict_index_get_if_in_cache_low().
The direct call in buf_page_print() was prone to crashing, in case the
table definition was concurrently evicted or dropped from the
data dictionary cache.

2c1aaa6... by Hirokazu Hata <email address hidden>

MDEV-28854 Disallow INSERT DELAYED on Spider table

Spider supports (or at least allows) INSERT DELAYED but the
documentation does not specify spider as a storage engine that supports
Also, although not mentioned in the documentation, "INSERT DELAYED" is
not intended to be executed inside a transaction, as can be seen from
the list of supported storage engines.
The current implementation allows executing a delayed insert on a
remote transactional table and this breaks the consistency ensured by
the transaction.

We too remove "internal_delayed", one of the Spider table parameters.
Documentation says,

> Whether to transmit existence of delay to remote servers when
> executing an INSERT DELAYED statement on local server.

This table parameter is only used for "INSERT DELAYED".

Reviewed by: Nayuta Yanagisawa