database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.11 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2025-01-09 07:58:08 +02:00
parent 437550b7cf 28b2958082
commit 17f01186f5
473 changed files with 4731 additions and 3149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/versioning/r/partition.result
View File

@@ -1146,7 +1146,7 @@ f varchar(45000)
partition by system_time interval 1 year (partition p1 history,
partition pn current);
# fill the table until full
insert into t1 () values (),(),(),(),(),(),(),(),(),(),(),(),(),(),(),();
insert into t1 () values (),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),();
insert into t1 (f) select f from t1;
ERROR HY000: The table 't1' is full
# leave space for exactly one record in current partition
@@ -1162,7 +1162,7 @@ f varchar(45000)
) with system versioning engine=memory
partition by system_time interval 1 year (partition p1 history,
partition pn current);
insert into t1 () values (),(),(),(),(),(),(),(),(),(),(),(),(),(),(),();
insert into t1 () values (),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),(),();
select * into outfile 'MDEV-17891.data' from t1;
load data infile 'MDEV-17891.data' replace into table t1;
load data infile 'MDEV-17891.data' replace into table t1;

4
mysql-test/suite/versioning/r/select2,trx_id.rdiff
View File

@@ -1,5 +1,5 @@
--- suite/versioning/r/select2.result 2022-12-12 19:34:34.242342915 +0200
+++ suite/versioning/r/select2,trx_id.reject 2022-12-12 19:37:18.721907294 +0200
--- select2.result
+++ select2,trx_id.reject
@@ -22,6 +22,8 @@
delete from t1 where x > 7;
insert into t1(x, y) values(3, 33);