MariaDB

maria:bb-10.10-andrei

  1. Git
  2. lp:maria
  3. bb-10.10-andrei
Last commit made on 2022-08-08
Get this branch:
git clone -b bb-10.10-andrei https://git.launchpad.net/maria

Branch merges

Branch information

Name:
bb-10.10-andrei
Repository:
lp:maria

Recent commits

cb8010f... by Andrei <email address hidden>

MDEV-29078. Merge to 10.10 to account MDEV-19801.

Also a new test comment line gets corrected.

225c885... by Oleksandr "Sanja" Byelkin

Merge branch '10.9' into 10.10

1aad46c... by Oleksandr "Sanja" Byelkin

Merge branch '10.8' into 10.9

8c80931... by Oleksandr "Sanja" Byelkin

Merge branch '10.7' into 10.8

6df35a3... by Oleksandr "Sanja" Byelkin

Merge branch '10.6' into 10.7

3ebbfd8... by Alexander Barkov

MDEV-29159 Patch for MDEV-28918 introduces more inconsistency than it solves, breaks usability

1. Store assignment failures on incompatible data types now raise errors if:
- STRICT_ALL_TABLES or STRICT_TRANS_TABLES sql_mode is used, and
- IGNORE is not used

Otherwise, only a warning is raised and the statement continues.

2. Changing the error/warning test as follows:

-ERROR HY000: Illegal parameter data types inet6 and int for operation 'SET'
+ERROR HY000: Cannot cast 'int' as 'inet6' in assignment of `db`.`t`.`col`

so in case of a big table it's easier to see which column has the problem.
The new error text is also applied to SP variables.

c980350... by Marko Mäkelä

MDEV-13542 fixup: Improve a recovery error message

A message used to say "failed to read or decrypt"
but the "or decrypt" part was removed in
commit 0b47c126e31cddda1e94588799599e138400bcf8
without adjusting rarely needed error message suppressions in some
encryption tests.

Let us improve the error message so that it mentions the file name,
and adjust all error message suppressions in tests.

Thanks to Oleksandr Byelkin for noticing one test failure.

5dc8605... by Oleksandr "Sanja" Byelkin

fix tests

ee620a7... by Oleksandr "Sanja" Byelkin

Merge branch '10.5' into 10.6

3b071ba... by Sergey Petrunia

MDEV-29242: Assertion `computed_weight == weight' failed SEL_ARG::verify_weight

Make SEL_ARG::make_root() maintain SEL_ARG::weight.

Also, an unrelated change: fix dbug_print_sel_arg() to correctly
print SQL NULL for the right endpoint.