Last commit made on 2022-08-10
Get this branch:
git clone -b 10.6

Branch merges

Branch information


Recent commits

5d3bbc6... by Addison G <email address hidden>

MDEV-29222 - Fix mysqld_safe script

The mysqld_safe script was using bad grep options.

The line that was fixed was likely meant to be 2 separate grep commands,
piped into each other, with each one removing any lines that matched.

The `-E` option was unneeded, as the command is not using regex.

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.

ea12daf... by Oleksandr "Sanja" Byelkin

Merge branch '10.4' into 10.5

6adfce9... by Oleksandr "Sanja" Byelkin

Merge branch '10.3' into 10.4

43c7f6a... by Daniel Black

MDEV-18702: mysqldump: add variable 'max-statement-time' (mtr fix)

Disable for embedded as mysqldump cannot connect to embedded server.

b4c572f... by Oleksandr "Sanja" Byelkin

Merge branch '10.3' into 10.4

992b510... by Oleksandr "Sanja" Byelkin

Fix compile errors.