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.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2025-01-08 12:51:26 +02:00
parent 48b724047e b251cb6a4f
commit 420d9eb27f
327 changed files with 1921 additions and 980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1162,7 +1162,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
@@ -1178,7 +1178,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/select,trx_id.rdiff
View File

@@ -1,5 +1,5 @@
--- select.result 2018-06-29 18:09:17.962447067 +0200
+++ select.reject 2018-06-29 18:10:04.618808616 +0200
--- select.result
+++ select.reject
@@ -17,6 +17,8 @@
(8, 108),
(9, 109);

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

@@ -1,5 +1,5 @@
--- select2.result 2018-06-29 17:51:17.142172085 +0200
+++ select2,trx_id.reject 2018-06-29 18:03:49.034273090 +0200
--- select2.result
+++ select2,trx_id.reject
@@ -26,6 +26,8 @@
select sys_start from t1 where x = 3 and y = 33 into @t1;
Warnings: