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/innodb/r/alter_algorithm,INPLACE.rdiff
View File

@@ -1,5 +1,5 @@
--- alter_algorithm.result 2020-04-30 21:39:48.923115511 +0530
+++ alter_algorithm.reject 2020-04-30 21:45:04.131642093 +0530
--- alter_algorithm.result
+++ alter_algorithm.reject
@@ -7,43 +7,43 @@
INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1);
SELECT @@alter_algorithm;

4
mysql-test/suite/innodb/r/alter_algorithm,INSTANT.rdiff
View File

@@ -1,5 +1,5 @@
--- alter_algorithm.result 2020-04-30 21:39:48.923115511 +0530
+++ alter_algorithm.reject 2020-04-30 21:47:08.245465018 +0530
--- alter_algorithm.result
+++ alter_algorithm.reject
@@ -7,43 +7,35 @@
INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1);
SELECT @@alter_algorithm;

4
mysql-test/suite/innodb/r/alter_algorithm,NOCOPY.rdiff
View File

@@ -1,5 +1,5 @@
--- alter_algorithm.result 2020-04-30 21:39:48.923115511 +0530
+++ alter_algorithm.reject 2020-04-30 21:52:10.785967739 +0530
--- alter_algorithm.result
+++ alter_algorithm.reject
@@ -7,43 +7,35 @@
INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1);
SELECT @@alter_algorithm;

4
mysql-test/suite/innodb/r/instant_alter_limit,16k.rdiff
View File

@@ -1,5 +1,5 @@
--- instant_alter_limit.result 2020-05-26 18:01:27.377946439 +0530
+++ instant_alter_limit,16k.reject 2020-05-26 20:14:38.452463919 +0530
--- instant_alter_limit.result
+++ instant_alter_limit,16k.reject
@@ -45,3 +45,10 @@
instants
502

4
mysql-test/suite/innodb/r/instant_alter_limit,32k.rdiff
View File

@@ -1,5 +1,5 @@
--- instant_alter_limit.result 2020-05-26 18:01:27.377946439 +0530
+++ instant_alter_limit,32k.reject 2020-05-26 19:59:19.743877366 +0530
--- instant_alter_limit.result
+++ instant_alter_limit,32k.reject
@@ -43,5 +43,12 @@
FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column';

4
mysql-test/suite/innodb/r/instant_alter_limit,4k.rdiff
View File

@@ -1,5 +1,5 @@
--- instant_alter_limit.result 2020-05-26 18:01:27.377946439 +0530
+++ instant_alter_limit,4k.reject 2020-05-26 20:17:53.314736548 +0530
--- instant_alter_limit.result
+++ instant_alter_limit,4k.reject
@@ -5,6 +5,276 @@
ENGINE=InnoDB;
INSERT INTO t VALUES(1,2,3,4,5);

4
mysql-test/suite/innodb/r/instant_alter_limit,64k.rdiff
View File

@@ -1,5 +1,5 @@
--- instant_alter_limit.result 2020-05-26 18:01:27.377946439 +0530
+++ instant_alter_limit,64k.reject 2020-05-26 20:00:22.499711222 +0530
--- instant_alter_limit.result
+++ instant_alter_limit,64k.reject
@@ -43,5 +43,12 @@
FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column';

4
mysql-test/suite/innodb/r/instant_alter_limit,8k.rdiff
View File

@@ -1,5 +1,5 @@
--- instant_alter_limit.result 2020-05-26 18:01:27.377946439 +0530
+++ instant_alter_limit,8k.reject 2020-05-26 20:19:50.881869095 +0530
--- instant_alter_limit.result
+++ instant_alter_limit,8k.reject
@@ -5,6 +5,28 @@
ENGINE=InnoDB;
INSERT INTO t VALUES(1,2,3,4,5);

4
mysql-test/suite/innodb/r/max_record_size,16k,compact.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 12:51:26.070418078 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -3,45 +3,65 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 CHAR(255),

4
mysql-test/suite/innodb/r/max_record_size,16k,dynamic.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 12:52:54.580956978 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -3,45 +3,207 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 CHAR(255),

4
mysql-test/suite/innodb/r/max_record_size,16k,redundant.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 12:55:05.258762945 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -3,45 +3,65 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 CHAR(255),

4
mysql-test/suite/innodb/r/max_record_size,32k,compact.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 12:27:08.004932026 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -3,45 +3,104 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 CHAR(255),

4
mysql-test/suite/innodb/r/max_record_size,32k,dynamic.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 12:38:41.609328820 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -3,45 +3,351 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 CHAR(255),

4
mysql-test/suite/innodb/r/max_record_size,32k,redundant.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 12:41:03.319664978 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -3,45 +3,104 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 CHAR(255),

4
mysql-test/suite/innodb/r/max_record_size,4k,compact.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 12:56:23.489432164 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -1,47 +1,37 @@
call mtr.add_suppression("Cannot add field `.*` in table `test`.`t1` because after adding it, the row size is");
CREATE TABLE t1 (

4
mysql-test/suite/innodb/r/max_record_size,4k,dynamic.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 12:57:38.636143710 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -1,47 +1,103 @@
call mtr.add_suppression("Cannot add field `.*` in table `test`.`t1` because after adding it, the row size is");
CREATE TABLE t1 (

4
mysql-test/suite/innodb/r/max_record_size,4k,redundant.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 12:58:58.318768169 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -1,47 +1,37 @@
call mtr.add_suppression("Cannot add field `.*` in table `test`.`t1` because after adding it, the row size is");
CREATE TABLE t1 (

4
mysql-test/suite/innodb/r/max_record_size,64k,compact.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 12:45:21.760116841 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -3,45 +3,186 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 CHAR(255),

4
mysql-test/suite/innodb/r/max_record_size,64k,dynamic.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 12:48:32.453208310 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -3,45 +3,486 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 CHAR(255),

4
mysql-test/suite/innodb/r/max_record_size,64k,redundant.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 12:50:05.663724193 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -3,45 +3,104 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 CHAR(255),

4
mysql-test/suite/innodb/r/max_record_size,8k,compact.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 13:00:25.037261867 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -12,7 +12,7 @@
c9 CHAR(255), c10 CHAR(255), c11 CHAR(255), c12 CHAR(255),
c13 CHAR(255), c14 CHAR(255), c15 CHAR(255), c16 CHAR(255)

4
mysql-test/suite/innodb/r/max_record_size,8k,dynamic.rdiff
View File

@@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300
+++ max_record_size.reject 2019-07-03 13:01:51.215756779 +0300
--- max_record_size.result
+++ max_record_size.reject
@@ -12,7 +12,7 @@
c9 CHAR(255), c10 CHAR(255), c11 CHAR(255), c12 CHAR(255),
c13 CHAR(255), c14 CHAR(255), c15 CHAR(255), c16 CHAR(255)

4
mysql-test/suite/innodb/r/recovery_memory,debug.rdiff
View File

@@ -1,5 +1,5 @@
--- recovery_memory.result 2024-06-21 12:54:38.026355524 +0530
+++ recovery_memory.reject 2024-06-21 17:22:49.394535026 +0530
--- recovery_memory.result
+++ recovery_memory.reject
@@ -23,6 +23,7 @@
CREATE TABLE t1(f1 INT NOT NULL)ENGINE=InnoDB;
INSERT INTO t1 SELECT * FROM seq_1_to_65536;

4
mysql-test/suite/innodb/r/restart,16k.rdiff
View File

@@ -1,5 +1,5 @@
--- ./suite/innodb/r/restart.result 2022-01-18 20:36:56.054653376 +1100
+++ suite/innodb/r/restart.reject 2022-01-19 08:12:28.602794678 +1100
--- ./suite/innodb/r/restart.result
+++ suite/innodb/r/restart.reject
@@ -32,10 +32,10 @@
SELECT @@innodb_buffer_pool_size INTO @innodb_buffer_pool_size_orig;
SELECT CEILING((256 + 64) * @@innodb_page_size / 1048576) * 1048576 INTO @min_pool_size;

4
mysql-test/suite/innodb/r/restart,32k.rdiff
View File

@@ -1,5 +1,5 @@
--- ./suite/innodb/r/restart.result 2022-01-18 20:36:56.054653376 +1100
+++ suite/innodb/r/restart.reject 2022-01-19 08:07:57.402230887 +1100
--- ./suite/innodb/r/restart.result
+++ suite/innodb/r/restart.reject
@@ -32,10 +32,10 @@
SELECT @@innodb_buffer_pool_size INTO @innodb_buffer_pool_size_orig;
SELECT CEILING((256 + 64) * @@innodb_page_size / 1048576) * 1048576 INTO @min_pool_size;

4
mysql-test/suite/innodb/r/restart,4k.rdiff
View File

@@ -1,5 +1,5 @@
--- ./suite/innodb/r/restart.result 2022-01-18 20:36:56.054653376 +1100
+++ suite/innodb/r/restart.reject 2022-01-19 08:13:56.397475513 +1100
--- ./suite/innodb/r/restart.result
+++ suite/innodb/r/restart.reject
@@ -32,10 +32,10 @@
SELECT @@innodb_buffer_pool_size INTO @innodb_buffer_pool_size_orig;
SELECT CEILING((256 + 64) * @@innodb_page_size / 1048576) * 1048576 INTO @min_pool_size;

4
mysql-test/suite/innodb/r/restart,64k.rdiff
View File

@@ -1,5 +1,5 @@
--- ./suite/innodb/r/restart.result 2022-01-18 20:36:56.054653376 +1100
+++ suite/innodb/r/restart.reject 2022-01-19 08:11:32.418759095 +1100
--- ./suite/innodb/r/restart.result
+++ suite/innodb/r/restart.reject
@@ -32,10 +32,10 @@
SELECT @@innodb_buffer_pool_size INTO @innodb_buffer_pool_size_orig;
SELECT CEILING((256 + 64) * @@innodb_page_size / 1048576) * 1048576 INTO @min_pool_size;

4
mysql-test/suite/innodb/r/restart,8k.rdiff
View File

@@ -1,5 +1,5 @@
--- ./suite/innodb/r/restart.result 2022-01-18 20:36:56.054653376 +1100
+++ suite/innodb/r/restart.reject 2022-01-19 08:13:11.027788852 +1100
--- ./suite/innodb/r/restart.result
+++ suite/innodb/r/restart.reject
@@ -32,10 +32,10 @@
SELECT @@innodb_buffer_pool_size INTO @innodb_buffer_pool_size_orig;
SELECT CEILING((256 + 64) * @@innodb_page_size / 1048576) * 1048576 INTO @min_pool_size;