1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä
2023-01-03 16:10:02 +02:00
149 changed files with 2784 additions and 1991 deletions

View File

@ -4,6 +4,7 @@
--source include/have_innodb.inc
--source include/have_debug.inc
--source include/maybe_versioning.inc
#--------------------------------------
# Check FTS_sync vs TRUNCATE (1)
@ -23,7 +24,16 @@ INSERT INTO t1 (value) VALUES
('By default or with the IN NATURAL LANGUAGE MODE modifier')
;
let $vers=$MTR_COMBINATION_VERS+$MTR_COMBINATION_VERS_TRX;
if ($vers)
{
--echo TRUNCATE TABLE t1;
}
if (!$vers)
{
TRUNCATE TABLE t1;
}
DROP TABLE t1;
@ -54,7 +64,14 @@ INSERT INTO t1 (value) VALUES
('collation of latin1_bin to make it case sensitive')
;
if ($vers)
{
--echo TRUNCATE TABLE t1;
}
if (!$vers)
{
TRUNCATE TABLE t1;
}
DROP TABLE t1;