Author: Teemu Ollakka
Author Date: 2023-02-13 16:14:50 UTC

MDEV-27317 wsrep_checkpoint order violation due to certification failure

With binlogs enabled, debug assertion ut_ad(xid_seqno > wsrep_seqno)
fired in trx_rseg_update_wsrep_checkpoint() when an applier thread
synced the seqno out of order for write set which had failed
certification. This was caused by releasing commit
order too early when binlogs were on, allowing group
commit to run in parallel and commit following transactions
too early.

Fixed by extending the commit order critical section to cover
call to wsrep_set_SE_checkpoint() also when binlogs are on.

Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>

Author: Nikita Malyavin
Author Date: 2023-02-20 11:05:46 UTC

fix Run-Time Check Failure on Windows

Author: Yuchen Pei
Author Date: 2023-02-20 02:03:53 UTC

add check for discarded in h_i::open()

Author: Nikita Malyavin
Author Date: 2023-02-17 16:58:41 UTC

fix after rebasing onto MDEV-30378 fix

Author: Lena Startseva
Author Date: 2022-09-19 05:26:59 UTC

MDEV-29390: Improve coverage for UPDATE and DELETE statements in MTR test suites

Created tests for "delete" based on update_use_source.test

For the update_use_source.test tests, data recovery in the table has been changed
from a rollback transaction to a complete delete and re-insert of the data with
optimize table. Cases are now being checked on three engines.

Added tests for update/delete with LooseScan and DuplicateWeedout optimization strategies
Added tests for engine MEMORY on delete and update
Added tests for multi-update with JSON_TABLE
Added tests for multi-update and multi-delete for engine Connect

Author: Yuchen Pei
Author Date: 2023-02-15 06:25:01 UTC

WIP try creating a table using cfg and cloning exiting table

Author: Rex Johnston
Author Date: 2023-02-16 20:28:38 UTC

MDEV-29179 Condition pushdown from HAVING into WHERE is not shown in optimizer trace

 JOIN::optimize_inner(), Condition pushdown from HAVING into WHERE
   not shown in optimizer trace.

Author: Nikita Malyavin
Author Date: 2022-10-21 12:08:26 UTC

MDEV-29068 Cascade foreign key updates do not apply in online alter

Author: Alexander Barkov
Author Date: 2023-02-14 09:27:46 UTC

MDEV-15751 CURRENT_TIMESTAMP should return a TIMESTAMP [WITH TIME ZONE?]

Author: Alexander Barkov
Author Date: 2023-02-14 07:52:10 UTC

MDEV-15750 preserve MYSQL_TYPE_TIMESTAMP in temporal arithmetic

    In progress.

Author: Rex Johnston
Author Date: 2023-02-01 18:29:05 UTC

MDEV-30334 Optimizer trace produces invalid JSON with WHERE subquery

 Simple code rearrangement to stop it displaying an unsigned int in a String.

Author: Sergey Petrunia
Author Date: 2023-02-13 13:54:13 UTC

MDEV-30596: Assertion 'pushed_rowid_filter != __null ...' failed

ha_partition doesn't forward Rowid Filter API calls to the storage
engines handling partitions.
An attempt to use rowid filtering with caused either
- Rowid Filter being shown in EXPLAIN but not actually used
- Assertion failure when subquery code tried to disable/enable rowid
  filter, which was not present.

Fixed by returning correct flags from ha_partition::index_flags()

Author: Sergey Petrunia
Author Date: 2023-02-13 13:54:13 UTC

MDEV-30596: Assertion 'pushed_rowid_filter != __null ...' failed

ha_partition doesn't forward Rowid Filter API calls to the storage
engines handling partitions.
An attempt to use rowid filtering with caused either
- Rowid Filter being shown in EXPLAIN but not actually used
- Assertion failure when subquery code tried to disable/enable rowid
  filter, which was not present.

Fixed by returning correct flags from ha_partition::index_flags()

Author: Alexander Barkov
Author Date: 2023-02-13 11:14:40 UTC

MDEV-30633 DATETIME to TIMESTAMP conversion to return maximum timestamp on overflow

Author: Vicențiu Ciorbaru
Author Date: 2023-02-10 09:59:36 UTC

Merge remote-tracking branch '10.4' into 10.5

Author: Daniel Black
Author Date: 2023-02-10 07:40:43 UTC

MDEV-30571 MariaDB-client does not pull MariaDB-compat anymore, conflicts with RHEL packages

Make MariaDB-client explictly pull MariaDB-common. I can't see
a reason for the change between 10.9.

Use SETA rather than set for common/compat dependencies out of caution.

Last commit seems to have resolved the common dependency on compat
(though its not obvious why).

Author: Igor Babaev
Author Date: 2023-02-10 06:42:29 UTC

Adjusted test results after rebase

Author: Rex Johnston
Author Date: 2023-02-09 22:38:28 UTC

MDEV-30629 Add optimizer trace to main/order_by_innodb.test to diagnose debian build issue

 Debian S390 build issue. Add optimizer trace to failing test
 (main.order_by_innodb) to help diagnose issue.

Author: Brandon Nesterenko
Author Date: 2023-02-08 17:32:35 UTC

MDEV-30608: rpl.rpl_delayed_parallel_slave_sbm sometimes fails with Seconds_Behind_Master should not have used second transaction timestamp

One of the constraints added in the MDEV-29639 patch, is that only
the first event after idling should update last_master_timestamp;
and as long as the replica has more events to execute, the variable
should not be updated. The corresponding test,
rpl_delayed_parallel_slave_sbm.test, aims to verify this; however,
if the IO thread takes too long to queue events, the SQL thread can
appear to catch up too fast.

This fix ensures that the relay log has been fully written before
executing the events.

Note that the underlying cause of this test failure needs to be
addressed as a bug-fix, this is a temporary fix to stop test
failures. To track work on the bug-fix for the underlying issue,
please see MDEV-30619.

Author: Fabrice Fontaine
Author Date: 2023-01-15 18:12:05 UTC

include/ssl_compat.h: fix build with libressl >= 3.5.0

Fix the following build failure with libressl >= 3.5.0:

In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18:
/tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048':
/tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'}
   68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G))
      | ^~

Fixes:
 - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Author: Daniel Black
Author Date: 2023-02-06 07:43:36 UTC

MDEV-30574 MariaDB-server conflicts with MariaDB-common from previous versions

Tie these two version to 11.0+.

Author: Marko Mäkelä
Author Date: 2023-02-06 05:23:43 UTC

MDEV-30567 rec_get_offsets() is not optimal

rec_init_offsets_comp_ordinary(), rec_init_offsets(),
rec_get_offsets_reverse(), rec_get_nth_field_offs_old():
Simplify some bitwise arithmetics to avoid conditional jumps,
and add branch prediction hints with the assumption that most
variable-length columns are short.

Author: Sergey Petrunia
Author Date: 2023-02-03 13:23:38 UTC

MDEV-30529: Assertion `rnd_records <= s->found_records' failed in best_access_path

best_access_path() has an assertion:

   DBUG_ASSERT(rnd_records <= s->found_records);

make it rounding-safe.

Author: Sergey Petrunia
Author Date: 2023-02-03 12:20:22 UTC

MDEV-30525: Assertion `ranges > 0' fails in IO_AND_CPU_COST handler::keyread_time

Make get_best_group_min_max() exit early if the table has
table->records()=0. Attempting to compute loose scan over 0
groups eventually causes an assert when trying to get the
cost of reading 0 ranges.

Author: Julius Goryavsky
Author Date: 2023-02-03 02:00:14 UTC

wsrep-lib submodule update

Author: Nayuta Yanagisawa
Author Date: 2022-09-27 06:22:57 UTC

MDEV-29644 a potential bug of null pointer dereference in spider_db_mbase::print_warnings()

The function spider_db_mbase::print_warnings() can potentially result
in a null pointer dereference.

Remove the null pointer dereference by cleaning up the function.

Some small changes to the original commit
422fb63a9bbee35c50b6c7be19d199afe0bc98fa.

Co-Authored-By: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Nayuta Yanagisawa
Author Date: 2022-09-27 06:22:57 UTC

MDEV-29644 a potential bug of null pointer dereference in spider_db_mbase::print_warnings()

The function spider_db_mbase::print_warnings() can potentially result
in a null pointer dereference.

Remove the null pointer dereference by cleaning up the function.

Some small changes to the original commit
422fb63a9bbee35c50b6c7be19d199afe0bc98fa.

Co-Authored-By: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Nayuta Yanagisawa
Author Date: 2022-09-27 06:22:57 UTC

MDEV-29644 a potential bug of null pointer dereference in spider_db_mbase::print_warnings()

The function spider_db_mbase::print_warnings() can potentially result
in a null pointer dereference.

Remove the null pointer dereference by cleaning up the function.

Some small changes to the original commit
422fb63a9bbee35c50b6c7be19d199afe0bc98fa.

Co-Authored-By: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Sergey Petrunia
Author Date: 2023-02-02 16:19:36 UTC

Merge 'bb-10.5-release-mdev30218' into bb-10.6-release-mdev30218

Author: Sergey Petrunia
Author Date: 2023-02-02 16:17:51 UTC

Merge 'bb-10.4-release-mdev30218' into bb-10.5-release-mdev30218

Author: Sergey Petrunia
Author Date: 2023-02-02 15:12:39 UTC

MDEV-30218: Incorrect optimization for rowid_filtering, correction

Final corrections:
- Remove incorrect tracing, "rowid_filter_skipped"
- Put the worst_seeks sanity check back

Author: Nikita Malyavin
Author Date: 2023-01-30 17:01:49 UTC

lost signal. enjoy!

Author: Oleksandr "Sanja" Byelkin
Author Date: 2023-02-01 15:29:16 UTC

Merge branch '10.6' into 10.7

Author: Julius Goryavsky
Author Date: 2023-02-01 14:29:27 UTC

MDEV-30452: ssl error: unexpected EOF while reading

This commit contains fixes for error codes, which are needed
because OpenSSL 3.x and recent versions of GnuTLS have changed
the indication of error codes when the peer does not send
close_notify before closing the connection.

Author: Daniel Black
Author Date: 2023-02-01 02:51:13 UTC

MDEV-30411- compare my_timer_cycles() and my_interval_timer()

Author: Igor Babaev
Author Date: 2023-01-31 21:14:53 UTC

MDEV-30218 Incorrect optimization for rowid_filtering

Correction over the last patch for this MDEV.

Author: Sergey Petrunia
Author Date: 2023-01-31 17:11:17 UTC

Debug patch: print filter_gain if it is less than 0.

Author: Brandon Nesterenko
Author Date: 2023-01-30 17:49:33 UTC

MDEV-17516 Regression

Replication lag issue using parallel replication

Test showing that after restart, SBM will start at
0, and then increase as soon as the IO thread
queues an event

Author: Sergey Petrunia
Author Date: 2023-01-30 13:21:38 UTC

Fix compile on some linux platforms

Author: Jan Lindström
Author Date: 2023-01-31 11:46:57 UTC

MDEV-26216 : SIGSEGV in MDL_lock::incompatible_granted_types_bitmap on HANDLER OPEN w/ duplicate table creation

HANDLER commands are not yet supported in a cluster. Return
error message if user tries to use them.

Author: Marko Mäkelä
Author Date: 2023-01-31 10:05:17 UTC

MDEV-29985 Remove the parameter innodb_file_per_table

This follows up commit e581396b7aea94485580d2c9edaa9c5df647f2b7
(MDEV-29983), which deprecated the parameter.

Author: Julius Goryavsky
Author Date: 2023-01-31 08:25:06 UTC

MDEV-30452: ssl error: unexpected EOF while reading

This commit contains a correction for a new behaviour was introduced
in OpenSSL 3.x when a peer does not send close_notify before closing
the connection - previously it was reported as an SSL_ERROR_SYSCALL
error with a errno == 0, but now it is reported as SSL_ERROR_SSL with
a special reason code.

Author: Igor Babaev
Author Date: 2023-01-31 03:42:27 UTC

MDEV-28958 Crash when checking whether condition can be pushed into view

Do not set any flags in the items for constant subformulas TRUE/FALSE when
checking pushability of a formula into a view. Occurrences of these
subformulas can be ignored when checking pushability of the formula.
At the same time the items used for these constants became immutable
starting from version 10.7.

Approved by Oleksandr Byelkin <sanja@mariadb.com>

Author: Monty
Author Date: 2021-10-06 09:34:54 UTC

Fixed bug in SQL_SELECT_LIMIT

We where comparing costs when we should be comparing number of rows
that will be examined

Author: Anel Husakovic
Author Date: 2023-01-27 14:53:50 UTC

Testing Windows bb without skip-name-resolve

Author: Yuchen Pei
Author Date: 2023-01-03 05:24:04 UTC

MDEV-29447 MDEV-26285 Refactor spider_db_mbase_util::open_item_func

spider_db_mbase_util::open_item_func() is a monster function.
It is difficult to maintain while it is expected that we need to
modify it when a new SQL function or a new func_type is added.

We split the function into two distinct functions: one handles the
case of str != NULL and the other handles the case of str == NULL.

This refactoring was done in a conservative way because we do not
have comprehensive tests on the function.

It also fixes a problem (MDEV-29447) where field items that are
arguments of a func item may be used before created / initialised.

Note this commit is a port of
3836098c29ef1b7ff9d5fbde99b690eab73a0df1 (MDEV-26285) to current
versions 10.3+.

Signed-off-by: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Anel Husakovic
Author Date: 2023-01-27 14:53:50 UTC

Testing Windows bb with skip-name-resolve

Author: midenok
Author Date: 2023-01-25 20:56:21 UTC

MDEV-29544 SIGSEGV in HA_CREATE_INFO::finalize_locked_tables

On finalize_atomic_replace() even if we dropped the original table
because we could not rename it to backup we also may fail to rename
temporary table by the same reason.

DDL_LOG flag passed as rename param helps to force rename when the
miscellaneous operations fail (such as maintaining the statistics).

Author: Lena Startseva
Author Date: 2022-09-19 05:26:59 UTC

MDEV-29390: Improve coverage for UPDATE and DELETE statements in MTR test suites

Created tests for "delete" based on update_use_source.test

For the update_use_source.test tests, data recovery in the table has been changed
from a rollback transaction to a complete delete and re-insert of the data with
optimize table. Cases are now being checked on three engines.

Added tests for update/delete with LooseScan and DuplicateWeedout optimization strategies
Added tests for engine MEMORY on delete and update
Added tests for multi-update with JSON_TABLE
Added tests for multi-update and multi-delete for engine Connect

Author: Sergey Petrunia
Author Date: 2023-01-26 09:04:28 UTC

MDEV-30218: Incorrect optimization for rowid_filtering, correction

Enable use of Rowid Filter optimization with eq_ref access.
Use the following assumptions:
- Assume index-only access cost is 50% of non-index-only access cost.
- Take into account that "Eq_ref access cache" reduces the number of
  lookups eq_ref access will make.
  = This means the number of Rowid Filter checks is reduced also
  = Eq_ref access cost is computed using that assumption (see
    prev_record_reads() call), so we should use it in all cost '
    computations.

Author: Igor Babaev
Author Date: 2023-01-25 19:46:28 UTC

MDEV-28616 Crash when using derived table over union with order by clause

This bug manifested itself when the server processed a query containing
a derived table over union whose ORDER BY clause included a subquery
with unresolvable column reference. For such a query the server crashed
when trying to resolve column references in the ORDER BY clause used by
union.
For any union with ORDER BY clause an extra SELECT_LEX structure is created
and it is attached to SELECT_LEX_UNIT structure of the union via the field
fake_select_lex. The outer context for fake_select_lex must be the same as
for other selects of the union. If the union is used in the FROM list of
a derived table then the outer context for fake_select_lex must be set to
NULL in line with other selects of the union. It was not done and it
caused a crash when searching for possible resolution of an unresolvable
column reference occurred in a subquery used in the ORDER BY clause.

Approved by Oleksandr Byelkin <sanja@mariadb.com>

Author: Jan Lindström
Author Date: 2023-01-03 10:18:38 UTC

MDEV-30318 : galera error messages in mariadb log without galera enabled

Do not compile wsrep_provider plugin if WITH_WSREP is not enabled.
We should not enable wsrep_provider plugin if WSREP_ON=OFF and
at that case we can only print information that Plugin
'wsrep-provider' is disabled.

Make sure tests require Galera library 26.4.14 if needed.

Author: Angelique Sklavounos
Author Date: 2023-01-25 04:12:33 UTC

MDEV-29943: Check gtid_slave_pos and use sync_with_master_gtid (and remove superfluous semicolons)

Author: Yuchen Pei
Author Date: 2023-01-25 02:11:47 UTC

MDEV-30464 Adding a testsuite spider/unfixed with a readme.

Author: Andrei
Author Date: 2023-01-05 18:08:01 UTC

MDEV-30323 Some DDLs like ANALYZE can complete on parallel slave out of order

ANALYZE was observed to race over a preceding in binlog order DML
in updating the binlog and slave gtid states.

Tagging ANALYZE and other admin class commands in binlog by the fixes
of MDEV-17515 left a flaw allowing such race leading to
the gtid mode out-of-order error.
This is fixed now to observe by ADMIN commands the ordered access to
the slave gtid status variables and binlog.

Author: Roman Nozdrin
Author Date: 2023-01-24 12:59:34 UTC

Columnstore version is 6.4.7 now

Author: Denis Protivensky
Author Date: 2022-12-05 14:03:32 UTC

MDEV-24623 Replicate bulk insert as table-level exclusive key

- introduce table key construction function in wsrep service interface
- don't add row keys when replicating bulk insert
- don't start bulk insert on applier or when transaction is not active
- don't start bulk insert for system versioned tables
- implement actual bulk insert table-level key replication

Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>

Author: Nikita Malyavin
Author Date: 2023-01-24 09:24:54 UTC

MDEV-30415 PERIOD false positive overlap wtih utf8mb4_unicode_nopad_ci

A wrong UNIQUE violation is caused here by camparing strings
'def' and 'def ' (with space), under utf8mb4_unicode_nopad_ci collation,
which means "don't count in paddings when comparing".

Field::cmp_prefix uses a comparison through collation, so cmp_binary should
be used instead.

Author: Yuchen Pei
Author Date: 2023-01-19 07:28:14 UTC

MDEV-30370 MDEV-22979 MDEV-29904 MDEV-27912 Spider hang when abort

This is Kentoku's fix for MDEV-22979 (e6e41f04f4e + 22a0097727f),
which also fixes 30370. Adding a test for MDEV-29904 to avoid
regression, given MDEV-27233 is a similar problem.

Also update restart_spider.inc to allow passing restart_parameters, so
that the test of MDEV-29904 works (MDEV-27912).

Author: Yuchen Pei
Author Date: 2023-01-03 05:24:04 UTC

MDEV-29447 WIP Refactor spider_db_mbase_util::open_item_func

WIP: incorporating comments from
https://lists.launchpad.net/maria-developers/msg13283.html

spider_db_mbase_util::open_item_func() is a monster function.
It is difficult to maintain while it is expected that we need to
modify it when a new SQL function or a new func_type is added.

We split the function into two distinct functions: one handles the
case of str != NULL and the other handles the case of str == NULL.

This refactoring was done in a conservative way because we do not
have comprehensive tests on the function.

It also fixes a problem (MDEV-29447) where field items that are
arguments of a func item may be used before created / initialised.

Note this commit is a port of
3836098c29ef1b7ff9d5fbde99b690eab73a0df1 (MDEV-26285) to current
versions 10.3+.

Signed-off-by: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Oleg Smirnov
Author Date: 2023-01-12 06:18:33 UTC

MDEV-29294 Assertion `functype() == ((Item_cond *) new_item)->functype()' failed in Item_cond::remove_eq_conds on SELECT

Item_singlerow_subselect may be converted to Item_cond during
optimization. So there is a possibility of constructing nested
Item_cond_and or Item_cond_or which is not allowed (such
conditions must be flattened).
This commit checks if such kind of optimization has been applied
and flattens the condition if needed

Author: Yuchen Pei
Author Date: 2023-01-19 07:28:14 UTC

MDEV-30370 MDEV-22979 MDEV-29904 MDEV-27912 Spider hang when abort

This is Kentoku's fix for MDEV-22979 (e6e41f04f4e + 22a0097727f),
which also fixes 30370. Adding a test for MDEV-29904 to avoid
regression, given MDEV-27233 is a similar problem.

Also update restart_spider.inc to allow passing restart_parameters, so
that the test of MDEV-29904 works (MDEV-27912).

Author: Yuchen Pei
Author Date: 2023-01-12 02:41:49 UTC

MDEV-26541 Make UBSAN builds work with spider again.

When built with ubsan and trying to load the spider plugin, the hidden
visibility of mysqld compiling flag causes ha_spider.so to be missing
the symbol ha_partition. This commit fixes that, as well as some
memcpy null pointer issues when built with ubsan.

Signed-off-by: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Yuchen Pei
Author Date: 2023-01-12 02:41:49 UTC

MDEV-26541 Make UBSAN builds work with spider again.

When built with ubsan and trying to load the spider plugin, the hidden
visibility of mysqld compiling flag causes ha_spider.so to be missing
the symbol ha_partition. This commit fixes that, as well as some
memcpy null pointer issues when built with ubsan.

Signed-off-by: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Daniel Black
Author Date: 2023-01-19 07:48:37 UTC

MDEV-30203: Move mysql symlinks to different package (script fix)

Move the scripts/CMakeLists.txt install links into INSTALL_SCRIPT.

As a result the linking of mariadb-install-db isn't needed.

INSTALL_SCRIPT components outside the scripts (like rocksdb)
now get the same attention.

Author: Daniel Black
Author Date: 2023-01-19 07:48:37 UTC

MDEV-30203: Move mysql symlinks to different package (script fix)

Move the scripts/CMakeLists.txt install links into INSTALL_SCRIPT.

As a result the linking of mariadb-install-db isn't needed.

INSTALL_SCRIPT components outside the scripts (like rocksdb)
now get the same attention.

Author: Yuchen Pei
Author Date: 2023-01-18 07:21:53 UTC

MDEV-30370 WIP extract init_queries to its own thread

Author: Sergey Petrunia
Author Date: 2023-01-18 17:17:51 UTC

MDEV-30052: SIGSEGV in subquery_types_allow_materialization, fix variant 2

remove_redundant_subquery_clauses() also removes elements from the
select list. It does so, because GROUP BY code might have added GROUP
BY columns there.

In this bug, it has tried to remove a select list element that was not
added, it was in the select list from the start.

Attempt to remove this element caused data corruption, as the current
select list (join->all_fields) shares elements with the original list
(join->fields_list).

Fixed by not attempting to remove elements that are in join->fields_list.

Author: Vladislav Vaintroub
Author Date: 2023-01-17 19:37:20 UTC

Skip optimizer_cost test, if perfschema is not compiled in.

The test is sensitive to number of engines that are statically compiled in.

Author: midenok
Author Date: 2022-12-10 11:25:55 UTC

MDEV-29831 Galera crashes when running CoR for a locked table after
    setting the minimum memory for a user session.

Failure happens when finalize_atomic_replace() was already finished
and we removed the table from locked tables list.
finalize_locked_tables() doesn't know about that, it doesn't add back
last deleted lock because operation_failed == true.
reopen_tables() doesn't reopen table and as a result we have NULL in
pos_in_locked_tables->table.

The fix adds the knowledge that the locked_tables_count changed since
the start of the command. And if that happened we
add_back_last_deleted_lock(). That makes MDEV-29544 fix with
locked_tables_decremented deprecated.

Alternative fix would add atomic_replace_finished to Atomic_info and
updated it on successful finalize_atomic_replace(). Then the condition
would look like this:

  if (atomic_replace_finished || !operation_failed)
  {
    /*
      Add back the deleted table and re-created table as a locked table
      This should always work as we have a meta lock on the table.
    */
    thd->locked_tables_list.add_back_last_deleted_lock(pos_in_locked_tables);
  }

Author: sjaakola
Author Date: 2022-06-30 08:39:05 UTC

MDEV-26391 BF abortable mariabackup execution

Forcing old style node desync and pause, despite of WSREP_MODE_BF_MARIABACKUP
if node is operating as SST donor.

Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>

Author: Daniel Black
Author Date: 2023-01-11 23:34:14 UTC

Use MariaDB as the project name in CMakeLists.txt (fix)

Partial revert of d29d915790f7da41cd89c469f0a4c6c9b8f8a5c3.

It seems from CI that lower case RPM names are generated without
explictly setting the package name to mixed case.

Author: Yuchen Pei
Author Date: 2023-01-13 07:23:09 UTC

Revert "MDEV-20502 Queries against spider tables return wrong values for columns following constant declarations."

This reverts commit 69c86abb646361c607a248f079f8fd4e600dcada.

Author: Jan Lindström
Author Date: 2023-01-15 10:55:57 UTC

Revert "Merge branch 10.4 into 10.5"

This reverts commit 179c2833721292a918280b7d114d94d81020105b, reversing
changes made to a44d896f98f2d2a3ebf0f1393bf84fd659ecd225.

Author: Jan Lindström
Author Date: 2023-01-15 10:01:50 UTC

Revert "Merge branch 10.4 into 10.5"

This reverts commit 179c2833721292a918280b7d114d94d81020105b, reversing
changes made to 981a6b704475176d032c13461baffcaf88802d34.

Author: Jan Lindström
Author Date: 2023-01-15 09:05:26 UTC

Merge 10.5 into 10.6

Author: Julius Goryavsky
Author Date: 2023-01-12 20:54:25 UTC

Merge 10.3 into 10.4

Author: Sergey Petrunia
Author Date: 2023-01-12 12:55:40 UTC

MDEV-30081: Crash with split_materialized over a VIEW

Consider a view and use of Split Materialized optimization to read it:

  create view v1 as (SELECT ... id1 FROM t1 GROUP BY id1);
  SELECT ... LEFT JOIN v1 ON v1.id1 = tbl2.col

Split Materialized will need to construct ref access inside the view:

  t1.id1= {outer reference to tbl2.col}

It will do so by cloning both parts of the equality (v1.id1 =tbl2.col)
and then "pushing it down" into subquery by calling

  item->walk(&Item::set_fields_as_dependent_processor, parent_join->select_lex)

for both parts of the equality.
The problem was that left part of the equality was "v1.id1", namely an
Item_direct_view_ref, which did not implement
set_fields_as_dependent_processor() function.

Failure to do that resulted in Item_direct_view_ref reporting invalid
used_tables() in some cases (the case we've hit required that
Item_direct_view_ref is inside an outer join, and the column it refers
to is marked as constant)

Fixed by implementing Item_direct_ref::set_fields_as_dependent_processor().

Author: Vladislav Vaintroub
Author Date: 2023-01-10 10:56:44 UTC

MDEV-26714 - fix mariadb-upgrade

mariadb-upgrade needs to accept credential-manager parameter.
At the moment, it would have no effect - all the credential manager logic
is encapsulated inside cli_connect, and mariadb-upgrade does not
connect to the server itself (instead invoking the cli)

Author: THIRUNARAYANAN BALATHANDAYUTHAPANI
Author Date: 2023-01-06 11:44:23 UTC

MDEV-16232 Use fewer mini-transactions

- Fail to change the latch operation in row_search_mvcc.

Author: Vladislav Vaintroub
Author Date: 2023-01-04 17:52:18 UTC

optimizer_switch stored procedures in sys schema.

Split optimizer_switch into individual option names and values, and return
it as result set.

Author: Marko Mäkelä
Author Date: 2023-01-05 08:26:20 UTC

Merge 10.6

Author: Sergey Petrunia
Author Date: 2022-12-22 12:49:10 UTC

MDEV-20501: Assertion `maybe_null || !null_value' failed in Item_func_round::date_op

When the optimizer finds a constant (or system) table $TBL which is empty
or has no matching row, it would set table->null_row=true. This is done
even for tables with table->maybe_null==0.

Then, it would proceed to perform query optimization phases (what for?)
which will attempt to evaluate Item expressions referring to $TBL.

Eventually some Item expression will get the value of $TBL.not_null_field,
get SQL NULL and fail an assertion.

Fixed by not performing any query optimization steps after we've got
constant/empty tables with no matching rows.

Test result changes contain a lot of changes like
- ... Impossible WHERE noticed after reading const tables
+ ... no matching row in const table

as well as other changes caused by slightly-different processing of
the special case of empty constant tables.

Author: Sergey Petrunia
Author Date: 2022-12-29 14:46:40 UTC

Make main.innodb_icp test stable

Author: Yuchen Pei
Author Date: 2023-01-03 05:24:04 UTC

MDEV-29447 MDEV-26285 Refactor spider_db_mbase_util::open_item_func

Porting commit 3836098c29ef1b7ff9d5fbde99b690eab73a0df1 (MDEV-26285)
to current versions 10.3+ to fix a problem (MDEV-29447) where field
items that are arguments of a func item may be used before created /
initialised.

Signed-off-by: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Yuchen Pei
Author Date: 2023-01-03 05:24:04 UTC

MDEV-29447 MDEV-26285 Refactor spider_db_mbase_util::open_item_func

Porting commit 3836098c29ef1b7ff9d5fbde99b690eab73a0df1 (MDEV-26285)
to current versions 10.3+ to fix a problem (MDEV-29447) where field
items that are arguments of a func item may be used before created /
initialised.

Signed-off-by: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Yuchen Pei
Author Date: 2023-01-03 05:24:04 UTC

MDEV-29447 MDEV-26285 Refactor spider_db_mbase_util::open_item_func

Porting commit 3836098c29ef1b7ff9d5fbde99b690eab73a0df1 (MDEV-26285)
to current versions 10.3+ to fix a problem (MDEV-29447) where field
items that are arguments of a func item may be used before created /
initialised.

Signed-off-by: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Yuchen Pei
Author Date: 2023-01-03 05:24:04 UTC

MDEV-29447 MDEV-26285 Refactor spider_db_mbase_util::open_item_func

Porting commit 3836098c29ef1b7ff9d5fbde99b690eab73a0df1 (MDEV-26285)
to current versions 10.3+ to fix a problem (MDEV-29447) where field
items that are arguments of a func item may be used before created /
initialised.

Signed-off-by: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Marko Mäkelä
Author Date: 2023-01-03 12:38:27 UTC

WIP merge 10.3 into 10.4

Author: Jan Lindström
Author Date: 2023-01-03 10:18:38 UTC

MDEV-30318 : galera error messages in mariadb log without galera enabled

Do not compile wsrep_provider plugin if WITH_WSREP is not enabled.
We should not enable wsrep_provider plugin if WSREP_ON=OFF and
at that case we can only print information that Plugin
'wsrep-provider' is disabled.

Make sure tests require Galera library 26.4.14 if needed.

Author: Yuchen Pei
Author Date: 2023-01-03 05:24:04 UTC

MDEV-29447 MDEV-26285 Refactor spider_db_mbase_util::open_item_func

Porting commit 3836098c29ef1b7ff9d5fbde99b690eab73a0df1 (MDEV-26285)
to current versions 10.3+ to fix a problem (MDEV-29447) where field
items that are arguments of a func item may be used before created /
initialised.

Signed-off-by: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Yuchen Pei
Author Date: 2023-01-03 05:24:04 UTC

MDEV-29447 MDEV-26285 Refactor spider_db_mbase_util::open_item_func

Porting commit 3836098c29ef1b7ff9d5fbde99b690eab73a0df1 (MDEV-26285)
to current versions 10.3+ to fix a problem (MDEV-29447) where field
items that are arguments of a func item may be used before created /
initialised.

Signed-off-by: Yuchen Pei <yuchen.pei@mariadb.com>

Author: Oleg Smirnov
Author Date: 2023-01-02 07:46:46 UTC

MDEV-16232: Use fewer mini-transactions

SQL Layer support #3.
Add checks of applicability for UPDATEs and DELETEs.

Rename "operations batch" to "mini transactions" to disambiguate
the term "batch" which is already used.

Temporary disable mini-transactions for SELECTs.

Author: Rucha Deodhar
Author Date: 2022-12-29 12:04:53 UTC

MDEV-29381: JSON paths containing dashes are reported as syntax errors in
procedures

Analysis:
While scanning json path, when '-' is encountered while scanning a key,
the the json_path_transition reports incorrect state that denotes
syntax error. Hence it incorrectly reports error.
Fix:
Change JE_SYN to PS_KNMX to keep scanning the key.

Author: Julius Goryavsky
Author Date: 2022-12-19 09:29:55 UTC

MDEV-28669 addendum: additional tests and mtr changes

This commit contains additions to mtr:

1) Running .sh scripts (which can be executed before running
   the test) moved to an earlier stage so that they can create
   directories or perform other useful actions before the boostrap
   phase of the test;
2) Changes have been added that allow the user to set a custom
   location for datadir during a test, both as an option on the
   command line and via a configuration parameter - so that tests
   can be created that use a custom datadir location, and also
   check work with this parameter;
3) Added more precise filters for options that require a new
   bootstrap with rebuilding the database before starting the test;
4) Now mtr sets an environment variable MTR_BOOTSTRAP_OPTS_<suffix>
   that can be used in scripts if these scripts need to know with
   what additional bootstrap parameters was used when server was
   started - which is relevant for those tests that require individual
   bootstrap and then re-start server from within - these tests need
   to know what additional the parameters must be passed to the
   server (except for those specific to this particular text itself),
   for example, this facilitates the launch of tests for galera
   recovery.

This commit also contains tests for Galera: for MDEV-28669,
MDEV-30157, MDEV-30220, MDEV-29591, which depend on the presence
of the above changes in mtr and are themselves a check for these
changes.

Author: Sergey Petrunia
Author Date: 2022-12-28 18:26:45 UTC

MDEV-30310: patch from Monty, a bit amended

Author: Sergei Golubchik
Author Date: 2022-12-28 11:10:38 UTC

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.

Author: Rex Johnston
Author Date: 2022-12-22 17:28:59 UTC

MDEV-28602 Wrong result with outer join, merged derived table and view

    const item reference being mishandled in outer to inner join on
    filling in null values.

Author: Igor Babaev
Author Date: 2022-12-24 04:54:01 UTC

MDEV-29971 Re-design the upper level of handling SELECT statements

The initial patch.
All tests from the main test suite passed.

Author: midenok
Author Date: 2022-12-23 08:45:14 UTC

MDEV-30186 Use of uninitialized value $test_name in substitution

Revert "Format properly mtr report for the test case that is not completed"
This reverts commit 0c62b6d5652a66fa654e91dd27e0a16433920e5c.

Revert "MDEV-25857: MTR should report at least last test that was executed in case of shutdown and not-completed"
This reverts commit 29e8c154172bd6b9dccd9757fddace93be6ad194.