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

Removed diff dates from rdiff files

Browse Source
This commit is contained in:
Monty
2022-12-02 17:27:34 +02:00
committed by Sergei Petrunia
parent 8b7c0d69d2
commit b74d2623eb
60 changed files with 120 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/alter_table_combinations,aria.rdiff
View File

@ -1,5 +1,5 @@
--- main/alter_table_combinations.result 2022-05-24 17:16:56.769146869 +0200 --- main/alter_table_combinations.result
+++ main/alter_table_combinations.reject 2022-05-24 17:25:20.847126357 +0200 +++ main/alter_table_combinations.reject
@@ -173,8 +173,7 @@ @@ -173,8 +173,7 @@
t3 CREATE TABLE `t3` ( t3 CREATE TABLE `t3` (
`a` int(11) DEFAULT NULL, `a` int(11) DEFAULT NULL,

4
mysql-test/main/alter_table_combinations,heap.rdiff
View File

@ -1,5 +1,5 @@
--- main/alter_table_combinations.result 2022-05-24 17:16:56.769146869 +0200 --- main/alter_table_combinations.result
+++ main/alter_table_combinations.reject 2022-05-24 17:25:01.216127156 +0200 +++ main/alter_table_combinations.reject
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
alter table t1 change x xx int, algorithm=inplace; alter table t1 change x xx int, algorithm=inplace;
check table t1; check table t1;

4
mysql-test/main/myisam_mrr,32bit.rdiff
View File

@ -1,5 +1,5 @@
--- main/myisam_mrr.result 2019-05-14 15:44:52.232663568 +0530 --- main/myisam_mrr.result
+++ main/myisam_mrr.reject 2019-05-14 15:51:37.123563538 +0530 +++ main/myisam_mrr.reject
@@ -617,8 +617,8 @@ @@ -617,8 +617,8 @@
show status like 'handler_mrr%'; show status like 'handler_mrr%';
Variable_name Value Variable_name Value

4
mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.rdiff
View File

@ -1,5 +1,5 @@
--- /home/alice/git/10.3/mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.result~ 2021-03-19 17:27:12.935559866 +0100 --- /home/alice/git/10.3/mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.result~
+++ /home/alice/git/10.3/mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.reject 2021-03-19 17:27:14.071534938 +0100 +++ /home/alice/git/10.3/mysql-test/suite/engines/funcs/r/rpl_sp,myisam,mix.reject
@@ -126,12 +126,15 @@ @@ -126,12 +126,15 @@
show warnings; show warnings;
Level Code Message Level Code Message

4
mysql-test/suite/galera/r/galera_ist_MDEV-28423,debug.rdiff
View File

@ -1,5 +1,5 @@
--- suite/galera/r/galera_ist_MDEV-28423.result 2022-06-13 09:40:33.073863796 +0300 --- suite/galera/r/galera_ist_MDEV-28423.result
+++ suite/galera/r/galera_ist_MDEV-28423.reject 2022-06-13 09:58:59.936874991 +0300 +++ suite/galera/r/galera_ist_MDEV-28423.reject
@@ -517,3 +517,187 @@ @@ -517,3 +517,187 @@
1 1
DROP TABLE t1; DROP TABLE t1;

4
mysql-test/suite/galera/r/galera_ist_MDEV-28583,debug.rdiff
View File

@ -1,5 +1,5 @@
--- suite/galera/r/galera_ist_MDEV-28583.result 2022-06-11 10:48:16.875034382 +0300 --- suite/galera/r/galera_ist_MDEV-28583.result
+++ suite/galera/r/galera_ist_MDEV-28583,debug.reject 2022-06-11 11:25:55.616481509 +0300 +++ suite/galera/r/galera_ist_MDEV-28583,debug.reject
@@ -517,3 +517,187 @@ @@ -517,3 +517,187 @@
1 1
DROP TABLE t1; DROP TABLE t1;

4
mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff
View File

@ -1,5 +1,5 @@
--- r/galera_ist_mariabackup.result 2021-04-10 14:21:16.141724901 +0300 --- r/galera_ist_mariabackup.result
+++ r/galera_ist_mariabackup,debug.reject 2021-04-10 14:49:04.455785652 +0300 +++ r/galera_ist_mariabackup,debug.reject
@@ -517,3 +517,187 @@ @@ -517,3 +517,187 @@
1 1
DROP TABLE t1; DROP TABLE t1;

4
mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff
View File

@ -1,5 +1,5 @@
--- r/galera_ist_mariabackup_innodb_flush_logs.result 2021-04-10 14:21:52.661886653 +0300 --- r/galera_ist_mariabackup_innodb_flush_logs.result
+++ r/galera_ist_mariabackup_innodb_flush_logs,debug.reject 2021-04-10 14:49:56.740062774 +0300 +++ r/galera_ist_mariabackup_innodb_flush_logs,debug.reject
@@ -172,3 +172,187 @@ @@ -172,3 +172,187 @@
1 1
DROP TABLE t1; DROP TABLE t1;

4
mysql-test/suite/galera/r/galera_ist_rsync,debug.rdiff
View File

@ -1,5 +1,5 @@
--- r/galera_ist_rsync.result 2021-04-10 14:24:05.942467091 +0300 --- r/galera_ist_rsync.result
+++ r/galera_ist_rsync,debug.reject 2021-04-10 14:52:14.236776538 +0300 +++ r/galera_ist_rsync,debug.reject
@@ -517,3 +517,187 @@ @@ -517,3 +517,187 @@
1 1
DROP TABLE t1; DROP TABLE t1;

4
mysql-test/suite/galera/r/galera_sst_mariabackup_data_dir,debug.rdiff
View File

@ -1,5 +1,5 @@
--- r/galera_sst_mariabackup_data_dir.result 2021-04-10 14:26:02.798965488 +0300 --- r/galera_sst_mariabackup_data_dir.result
+++ r/galera_sst_mariabackup_data_dir,debug.reject 2021-04-10 14:54:44.825538224 +0300 +++ r/galera_sst_mariabackup_data_dir,debug.reject
@@ -516,5 +516,189 @@ @@ -516,5 +516,189 @@
1 1
DROP TABLE t1; DROP TABLE t1;

4
mysql-test/suite/galera/r/galera_sst_mariabackup_force_recovery,debug.rdiff
View File

@ -1,5 +1,5 @@
--- r/galera_sst_mariabackup.result 2021-04-10 14:25:04.142716409 +0300 --- r/galera_sst_mariabackup.result
+++ r/galera_sst_mariabackup,debug.reject 2021-04-10 14:53:30.033162191 +0300 +++ r/galera_sst_mariabackup,debug.reject
@@ -516,5 +516,189 @@ @@ -516,5 +516,189 @@
1 1
DROP TABLE t1; DROP TABLE t1;

4
mysql-test/suite/galera/r/galera_sst_rsync2,debug.rdiff
View File

@ -1,5 +1,5 @@
--- r/galera_sst_rsync2.result 2021-04-10 14:34:48.646288119 +0300 --- r/galera_sst_rsync2.result
+++ r/galera_sst_rsync2,debug.reject 2021-04-10 15:04:10.276286996 +0300 +++ r/galera_sst_rsync2,debug.reject
@@ -516,3 +516,187 @@ @@ -516,3 +516,187 @@
1 1
DROP TABLE t1; DROP TABLE t1;

4
mysql-test/suite/galera/r/galera_sst_rsync_data_dir,debug.rdiff
View File

@ -1,5 +1,5 @@
--- r/galera_sst_rsync_data_dir.result 2021-04-10 14:35:28.090610315 +0300 --- r/galera_sst_rsync_data_dir.result
+++ r/galera_sst_rsync_data_dir,debug.reject 2021-04-10 15:50:26.945234998 +0300 +++ r/galera_sst_rsync_data_dir,debug.reject
@@ -516,3 +516,187 @@ @@ -516,3 +516,187 @@
1 1
DROP TABLE t1; DROP TABLE t1;

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.result
+++ alter_algorithm.reject 2020-04-30 21:45:04.131642093 +0530 +++ alter_algorithm.reject
@@ -7,43 +7,43 @@ @@ -7,43 +7,43 @@
INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1); INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1);
SELECT @@alter_algorithm; 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.result
+++ alter_algorithm.reject 2020-04-30 21:47:08.245465018 +0530 +++ alter_algorithm.reject
@@ -7,43 +7,35 @@ @@ -7,43 +7,35 @@
INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1); INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1);
SELECT @@alter_algorithm; 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.result
+++ alter_algorithm.reject 2020-04-30 21:52:10.785967739 +0530 +++ alter_algorithm.reject
@@ -7,43 +7,35 @@ @@ -7,43 +7,35 @@
INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1); INSERT INTO t1(f1, f2, f3) VALUES(1, 1, 1);
SELECT @@alter_algorithm; SELECT @@alter_algorithm;

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

@ -1,5 +1,5 @@
--- mysql-test/suite/innodb/r/check_ibd_filesize.result 2022-08-16 17:28:06.462350465 +0530 --- mysql-test/suite/innodb/r/check_ibd_filesize.result
+++ mysql-test/suite/innodb/r/check_ibd_filesize.reject 2022-08-16 17:29:25.129637040 +0530 +++ mysql-test/suite/innodb/r/check_ibd_filesize.reject
@@ -3,18 +3,12 @@ @@ -3,18 +3,12 @@
# SPACE IN 5.7 THAN IN 5.6 # SPACE IN 5.7 THAN IN 5.6
# #

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

@ -1,5 +1,5 @@
--- mysql-test/suite/innodb/r/check_ibd_filesize.result 2022-08-16 17:28:06.462350465 +0530 --- mysql-test/suite/innodb/r/check_ibd_filesize.result
+++ mysql-test/suite/innodb/r/check_ibd_filesize.reject 2022-08-16 17:31:39.288769153 +0530 +++ mysql-test/suite/innodb/r/check_ibd_filesize.reject
@@ -3,18 +3,18 @@ @@ -3,18 +3,18 @@
# SPACE IN 5.7 THAN IN 5.6 # SPACE IN 5.7 THAN IN 5.6
# #

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

@ -1,5 +1,5 @@
--- mysql-test/suite/innodb/r/check_ibd_filesize.result 2022-08-16 17:28:06.462350465 +0530 --- mysql-test/suite/innodb/r/check_ibd_filesize.result
+++ mysql-test/suite/innodb/r/check_ibd_filesize.reject 2022-08-16 17:30:28.957174270 +0530 +++ mysql-test/suite/innodb/r/check_ibd_filesize.reject
@@ -3,18 +3,12 @@ @@ -3,18 +3,12 @@
# SPACE IN 5.7 THAN IN 5.6 # SPACE IN 5.7 THAN IN 5.6
# #

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

@ -1,5 +1,5 @@
--- mysql-test/suite/innodb/r/check_ibd_filesize.result 2022-08-16 17:28:06.462350465 +0530 --- mysql-test/suite/innodb/r/check_ibd_filesize.result
+++ mysql-test/suite/innodb/r/check_ibd_filesize.reject 2022-08-16 17:31:03.516962339 +0530 +++ mysql-test/suite/innodb/r/check_ibd_filesize.reject
@@ -3,18 +3,18 @@ @@ -3,18 +3,18 @@
# SPACE IN 5.7 THAN IN 5.6 # SPACE IN 5.7 THAN IN 5.6
# #

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.result
+++ instant_alter_limit,16k.reject 2020-05-26 20:14:38.452463919 +0530 +++ instant_alter_limit,16k.reject
@@ -45,3 +45,10 @@ @@ -45,3 +45,10 @@
instants instants
502 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.result
+++ instant_alter_limit,32k.reject 2020-05-26 19:59:19.743877366 +0530 +++ instant_alter_limit,32k.reject
@@ -43,5 +43,12 @@ @@ -43,5 +43,12 @@
FROM information_schema.global_status FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column'; 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.result
+++ instant_alter_limit,4k.reject 2020-05-26 20:17:53.314736548 +0530 +++ instant_alter_limit,4k.reject
@@ -5,6 +5,276 @@ @@ -5,6 +5,276 @@
ENGINE=InnoDB; ENGINE=InnoDB;
INSERT INTO t VALUES(1,2,3,4,5); 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.result
+++ instant_alter_limit,64k.reject 2020-05-26 20:00:22.499711222 +0530 +++ instant_alter_limit,64k.reject
@@ -43,5 +43,12 @@ @@ -43,5 +43,12 @@
FROM information_schema.global_status FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column'; 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.result
+++ instant_alter_limit,8k.reject 2020-05-26 20:19:50.881869095 +0530 +++ instant_alter_limit,8k.reject
@@ -5,6 +5,28 @@ @@ -5,6 +5,28 @@
ENGINE=InnoDB; ENGINE=InnoDB;
INSERT INTO t VALUES(1,2,3,4,5); INSERT INTO t VALUES(1,2,3,4,5);

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

@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300 --- max_record_size.result
+++ max_record_size.reject 2019-07-03 12:51:26.070418078 +0300 +++ max_record_size.reject
@@ -3,45 +3,65 @@ @@ -3,45 +3,65 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255), c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 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,innodb.rdiff
View File

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

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

@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300 --- max_record_size.result
+++ max_record_size.reject 2019-07-03 12:55:05.258762945 +0300 +++ max_record_size.reject
@@ -3,45 +3,65 @@ @@ -3,45 +3,65 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255), c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 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,innodb.rdiff
View File

@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300 --- max_record_size.result
+++ max_record_size.reject 2019-07-03 12:27:08.004932026 +0300 +++ max_record_size.reject
@@ -3,45 +3,104 @@ @@ -3,45 +3,104 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255), c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 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,innodb.rdiff
View File

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

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

@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300 --- max_record_size.result
+++ max_record_size.reject 2019-07-03 12:41:03.319664978 +0300 +++ max_record_size.reject
@@ -3,45 +3,104 @@ @@ -3,45 +3,104 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255), c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 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,innodb.rdiff
View File

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

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

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

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

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

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

@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300 --- max_record_size.result
+++ max_record_size.reject 2019-07-03 12:45:21.760116841 +0300 +++ max_record_size.reject
@@ -3,45 +3,186 @@ @@ -3,45 +3,186 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255), c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 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,innodb.rdiff
View File

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

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

@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300 --- max_record_size.result
+++ max_record_size.reject 2019-07-03 12:50:05.663724193 +0300 +++ max_record_size.reject
@@ -3,45 +3,104 @@ @@ -3,45 +3,104 @@
c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255), c1 CHAR(255), c2 CHAR(255), c3 CHAR(255), c4 CHAR(255),
c5 CHAR(255), c6 CHAR(255), c7 CHAR(255), c8 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,innodb.rdiff
View File

@ -1,5 +1,5 @@
--- max_record_size.result 2019-07-03 11:54:44.591421526 +0300 --- max_record_size.result
+++ max_record_size.reject 2019-07-03 13:00:25.037261867 +0300 +++ max_record_size.reject
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
c9 CHAR(255), c10 CHAR(255), c11 CHAR(255), c12 CHAR(255), c9 CHAR(255), c10 CHAR(255), c11 CHAR(255), c12 CHAR(255),
c13 CHAR(255), c14 CHAR(255), c15 CHAR(255), c16 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,innodb.rdiff
View File

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

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

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

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

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

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

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

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

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

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

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

4
mysql-test/suite/mtr/t/simple,c2,s1.rdiff
View File

@ -1,5 +1,5 @@
--- suite/mtr/t/simple.result 2012-02-04 12:13:41.000000000 +0100 --- suite/mtr/t/simple.result
+++ suite/mtr/t/simple,infile,verbose.reject 2012-02-04 12:16:10.000000000 +0100 +++ suite/mtr/t/simple,infile,verbose.reject
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
proxy proxy
select @@local_infile; select @@local_infile;

4
mysql-test/suite/mtr/t/simple,s2,c2.rdiff
View File

@ -1,5 +1,5 @@
--- suite/mtr/t/simple,old.result 2012-02-04 12:13:25.000000000 +0100 --- suite/mtr/t/simple,old.result
+++ suite/mtr/t/simple,old,infile.reject 2012-02-04 12:13:59.000000000 +0100 +++ suite/mtr/t/simple,old,infile.reject
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
proxy proxy
select @@local_infile; select @@local_infile;

4
mysql-test/suite/period/r/delete,myisam.rdiff
View File

@ -1,5 +1,5 @@
--- suite/period/r/delete.result 2019-02-16 11:14:23.511258191 +0100 --- suite/period/r/delete.result
+++ suite/period/r/delete.reject 2019-02-16 11:14:32.869258690 +0100 +++ suite/period/r/delete.reject
@@ -250,7 +250,6 @@ @@ -250,7 +250,6 @@
ERROR 22003: Out of range value for column 'id' at row 1 ERROR 22003: Out of range value for column 'id' at row 1
select * from t; select * from t;

4
mysql-test/suite/rpl/r/rpl_delayed_slave,parallel.rdiff
View File

@ -1,5 +1,5 @@
--- mysql-test/suite/rpl/r/rpl_delayed_slave.result 2016-10-14 21:14:02.338075590 +0200 --- mysql-test/suite/rpl/r/rpl_delayed_slave.result
+++ mysql-test/suite/rpl/r/rpl_delayed_slave,parallel.reject 2016-10-14 21:17:51.296986686 +0200 +++ mysql-test/suite/rpl/r/rpl_delayed_slave,parallel.reject
@@ -45,7 +45,6 @@ @@ -45,7 +45,6 @@
# wait for first query to execute # wait for first query to execute
# sleep 1*T # sleep 1*T

4
mysql-test/suite/rpl/r/rpl_insert_delayed,stmt.rdiff
View File

@ -1,5 +1,5 @@
--- suite/rpl/r/rpl_insert_delayed.result 2016-03-25 19:44:43.408210896 +0400 --- suite/rpl/r/rpl_insert_delayed.result
+++ suite/rpl/r/rpl_insert_delayed,stmt.reject 2016-03-25 23:55:18.396360848 +0400 +++ suite/rpl/r/rpl_insert_delayed,stmt.reject
@@ -18,19 +18,19 @@ @@ -18,19 +18,19 @@
insert delayed into t1 values(10, "my name"); insert delayed into t1 values(10, "my name");
flush table t1; flush table t1;

4
mysql-test/suite/rpl/r/rpl_iodku,stmt.rdiff
View File

@ -1,5 +1,5 @@
--- r/rpl_iodku.result 2022-05-04 18:51:24.956414404 +0300 --- r/rpl_iodku.result
+++ r/rpl_iodku,stmt.reject 2022-05-04 18:51:49.520106231 +0300 +++ r/rpl_iodku,stmt.reject
@@ -1,10 +1,15 @@ @@ -1,10 +1,15 @@
include/master-slave.inc include/master-slave.inc
[connection master] [connection master]

4
mysql-test/suite/rpl/r/rpl_row_big_table_id,32bit.rdiff
View File

@ -1,5 +1,5 @@
--- /home/my/maria-test/mysql-test/suite/rpl/r/rpl_row_big_table_id.result 2019-08-18 15:19:56.829962449 +0300 --- /home/my/maria-test/mysql-test/suite/rpl/r/rpl_row_big_table_id.result
+++ /home/my/maria-test/mysql-test/suite/rpl/r/rpl_row_big_table_id,32bit.reject 2019-08-18 15:20:19.253763968 +0300 +++ /home/my/maria-test/mysql-test/suite/rpl/r/rpl_row_big_table_id,32bit.reject
@@ -20,22 +20,22 @@ @@ -20,22 +20,22 @@
master-bin.000001 # Query 1 # use `test`; ALTER TABLE t comment '' master-bin.000001 # Query 1 # use `test`; ALTER TABLE t comment ''
master-bin.000001 # Gtid 1 # BEGIN GTID #-#-# master-bin.000001 # Gtid 1 # BEGIN GTID #-#-#

4
mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic,32bit.rdiff
View File

@ -1,5 +1,5 @@
--- suite/sys_vars/r/aria_sort_buffer_size_basic.result 2021-02-02 02:58:55.686921205 +0200 --- suite/sys_vars/r/aria_sort_buffer_size_basic.result
+++ suite/sys_vars/r/aria_sort_buffer_size_basic.reject 2021-02-02 11:02:12.361178360 +0200 +++ suite/sys_vars/r/aria_sort_buffer_size_basic.reject
@@ -44,5 +44,5 @@ @@ -44,5 +44,5 @@
set session aria_sort_buffer_size=cast(-1 as unsigned int); set session aria_sort_buffer_size=cast(-1 as unsigned int);
select @@session.aria_sort_buffer_size; select @@session.aria_sort_buffer_size;

4
mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit,32bit.rdiff
View File

@ -1,5 +1,5 @@
--- mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.result 2019-05-07 15:09:57.220599318 +0530 --- mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.result
+++ mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.reject 2019-05-07 15:10:20.012718538 +0530 +++ mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.reject
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
set global innodb_ft_result_cache_limit=5000000000; set global innodb_ft_result_cache_limit=5000000000;
+Warnings: +Warnings:

4
mysql-test/suite/sys_vars/r/sysvars_aria,32bit.rdiff
View File

@ -1,5 +1,5 @@
--- suite/sys_vars/r/sysvars_aria.result 2021-02-02 02:58:55.686921205 +0200 --- suite/sys_vars/r/sysvars_aria.result
+++ suite/sys_vars/r/sysvars_aria,32bit.reject 2021-02-02 10:55:53.876791633 +0200 +++ suite/sys_vars/r/sysvars_aria,32bit.reject
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
SESSION_VALUE NULL SESSION_VALUE NULL
DEFAULT_VALUE 8192 DEFAULT_VALUE 8192

4
mysql-test/suite/sys_vars/r/sysvars_debug,32bit.rdiff
View File

@ -1,5 +1,5 @@
--- r\sysvars_debug.result 2017-08-08 10:52:39.036804900 +0300 --- r\sysvars_debug.result
+++ r\sysvars_debug,32bit.reject 2017-09-10 08:06:38.447122100 +0300 +++ r\sysvars_debug,32bit.reject
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE 0 DEFAULT_VALUE 0

4
mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff
View File

@ -1,5 +1,5 @@
--- suite/sys_vars/r/sysvars_wsrep.result 2014-10-10 13:33:55.000000000 +0300 --- suite/sys_vars/r/sysvars_wsrep.result
+++ suite/sys_vars/r/sysvars_wsrep,32bit.reject 2014-10-10 19:38:09.000000000 +0300 +++ suite/sys_vars/r/sysvars_wsrep,32bit.reject
@@ -245,7 +245,7 @@ @@ -245,7 +245,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 131072 DEFAULT_VALUE 131072

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.result
+++ select.reject 2018-06-29 18:10:04.618808616 +0200 +++ select.reject
@@ -17,6 +17,8 @@ @@ -17,6 +17,8 @@
(8, 108), (8, 108),
(9, 109); (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.result
+++ select2,trx_id.reject 2018-06-29 18:03:49.034273090 +0200 +++ select2,trx_id.reject
@@ -26,6 +26,8 @@ @@ -26,6 +26,8 @@
select sys_start from t1 where x = 3 and y = 33 into @t1; select sys_start from t1 where x = 3 and y = 33 into @t1;
Warnings: Warnings:

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

@ -1,5 +1,5 @@
--- update.result 2018-12-19 13:55:35.873917389 +0300 --- update.result
+++ update,trx_id.reject 2018-12-19 13:55:35.533917399 +0300 +++ update,trx_id.reject
@@ -81,12 +81,10 @@ @@ -81,12 +81,10 @@
commit; commit;
select x, y, sys_trx_end = MAXVAL as current from t1 for system_time all order by sys_trx_end, x, y; select x, y, sys_trx_end = MAXVAL as current from t1 for system_time all order by sys_trx_end, x, y;

4
mysql-test/suite/wsrep/r/wsrep-recover-v25,binlogon.rdiff
View File

@ -1,5 +1,5 @@
--- r/wsrep-recover-v25.result 2019-02-28 09:20:56.153775856 +0200 --- r/wsrep-recover-v25.result
+++ r/wsrep-recover-v25.reject 2019-02-28 09:22:16.578113115 +0200 +++ r/wsrep-recover-v25.reject
@@ -12,4 +12,16 @@ @@ -12,4 +12,16 @@
SELECT VARIABLE_VALUE `expect 6` FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed'; SELECT VARIABLE_VALUE `expect 6` FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed';
expect 6 expect 6