maria:10.4-MDEV-29988-merge

Last commit made on 2023-01-03
Get this branch:
git clone -b 10.4-MDEV-29988-merge https://git.launchpad.net/maria

Branch merges

Branch information

Name:
10.4-MDEV-29988-merge
Repository:
lp:maria

Recent commits

d545107... by Marko Mäkelä

WIP merge 10.3 into 10.4

e51a1d6... by Andrew Hutchings

MDEV-30329: mariadb-service-convert resets systemd service to default User=root

If mariadb-service-convert is run and the user variable is unset then
this sets `User=` in `[Service]`, which then tries to run mariadb as
root, which in-turn fails. This only happens when mysqld_safe is missing
which is all the time now. So don't set `User=` if there is no user variable.

Reviewer: Sergei Golubchik <email address hidden> (in PR #2382)

21223c0... by Sergei Golubchik

MDEV-29988 group by fix

908c48a... by Sergei Golubchik

fixes for json.json_table and main.func_json in --ps

60f646e... by Oleksandr "Sanja" Byelkin

MDEV-29988: (spider fix) Major performance regression with 10.6.11

Make Item_direct_ref_to_item transparent for Spider

37a316c... by Dmitry Shulga <email address hidden>

MDEV-29988: Major performance regression with 10.6.11

The idea is to put Item_direct_ref_to_item as a transparent and
permanent wrapper before a string which require conversion.
So that Item_direct_ref_to_item would be the only place where
the pointer to the string item is stored, this pointer can be changed
and restored during PS execution as needed. And if any permanent
(subquery) optimization would need a pointer to the item,
it'll use a pointer to the Item_direct_ref_to_item - which is
a permanent item and won't go away.

a9b31b0... by Dmitry Shulga <email address hidden>

MDEV-29988: (revert) Major performance regression with 10.6.11

Reverted changed in server code introduced by
the commit bd9274faa469cc164099c7497c18a0e0a9b1184b.
Tests from this commit are retained.

8760f69... by Sergei Golubchik

MDEV-30102 file missing in development libraries

move mariadb_capi_rename.h out of private server headers,
because it's included by mysql.h which is not private.

ca23558... by Sergei Golubchik

--skip-name-resolve=0 didn't work

custom code in `case OPT_SKIP_RESOLVE`
was overriding the correct value from handle_options().

d78ac04... by Sergei Golubchik

ignore changes in submodules when committing everything

covers `git commit -a` and `git citool` (`git add`, `git status`, etc).
they can still be added explicitly