mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove dates from all rdiff files

Browse source
This commit is contained in:
Monty 2024-12-27 13:59:24 +02:00
parent 87ee1e75bc
commit 88d9348dfc
196 changed files with 392 additions and 392 deletions
Show stats 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.reject 2022-05-24 17:25:20.847126357 +0200
--- main/alter_table_combinations.result
+++ main/alter_table_combinations.reject
@@ -173,8 +173,7 @@
t3 CREATE TABLE `t3` (
`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.reject 2022-05-24 17:25:01.216127156 +0200
--- main/alter_table_combinations.result
+++ main/alter_table_combinations.reject
@@ -11,7 +11,7 @@
alter table t1 change x xx int, algorithm=inplace;
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.reject 2019-05-14 15:51:37.123563538 +0530
--- main/myisam_mrr.result
+++ main/myisam_mrr.reject
@@ -617,8 +617,8 @@
show status like 'handler_mrr%';
Variable_name Value

4
mysql-test/main/select,ps.rdiff
View file

@ -1,5 +1,5 @@
--- mysql-test/main/select.result 2023-01-31 09:30:58.151377805 +0100
+++ mysql-test/main/select.reject 2023-02-01 13:44:11.026958614 +0100
--- mysql-test/main/select.result
+++ mysql-test/main/select.reject
@@ -5661,6 +5661,8 @@
Note 1276 Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #1
Note 1276 Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #1

4
mysql-test/main/select_jcl6,ps.rdiff
View file

@ -1,5 +1,5 @@
--- mysql-test/main/select_jcl6.result 2023-01-31 09:30:58.151377805 +0100
+++ mysql-test/main/select_jcl6.reject 2023-02-01 13:44:10.722958771 +0100
--- mysql-test/main/select_jcl6.result
+++ mysql-test/main/select_jcl6.reject
@@ -5672,6 +5672,8 @@
Note 1276 Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #1
Note 1276 Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #1

4
mysql-test/main/select_pkeycache,ps.rdiff
View file

@ -1,5 +1,5 @@
--- mysql-test/main/select_pkeycache.result 2023-01-31 09:30:58.151377805 +0100
+++ mysql-test/main/select_pkeycache.reject 2023-02-01 13:43:21.742985365 +0100
--- mysql-test/main/select_pkeycache.result
+++ mysql-test/main/select_pkeycache.reject
@@ -5661,6 +5661,8 @@
Note 1276 Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #1
Note 1276 Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #1

4
mysql-test/suite/encryption/r/encrypt_and_grep,undo3.rdiff
View file

@ -1,5 +1,5 @@
--- encrypt_and_grep.result 2022-09-02 22:36:21.669650278 +0530
+++ encrypt_and_grep.reject 2022-11-29 19:01:22.080027528 +0530
--- encrypt_and_grep.result
+++ encrypt_and_grep.reject
@@ -14,6 +14,9 @@
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
NAME

4
mysql-test/suite/encryption/r/innodb-remove-encryption,undo3.rdiff
View file

@ -1,5 +1,5 @@
--- innodb-remove-encryption.result 2022-09-02 20:44:59.960430396 +0530
+++ innodb-remove-encryption,undo3.reject 2022-11-29 19:02:24.813094277 +0530
--- innodb-remove-encryption.result
+++ innodb-remove-encryption,undo3.reject
@@ -13,6 +13,9 @@
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
NAME

4
mysql-test/suite/encryption/r/innodb_encrypt_freed,undo3.rdiff
View file

@ -1,5 +1,5 @@
--- innodb_encrypt_freed.result 2021-03-23 15:44:14.466377983 +0530
+++ innodb_encrypt_freed,undo3.reject 2022-11-29 19:04:24.987010571 +0530
--- innodb_encrypt_freed.result
+++ innodb_encrypt_freed,undo3.reject
@@ -14,6 +14,9 @@
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
NAME

4
mysql-test/suite/encryption/r/innodb_encrypt_key_rotation_age,undo3.rdiff
View file

@ -1,5 +1,5 @@
--- innodb_encrypt_key_rotation_age.result 2022-06-02 16:15:08.395122720 +0530
+++ innodb_encrypt_key_rotation_age,undo3.reject 2022-11-29 19:06:07.964542115 +0530
--- innodb_encrypt_key_rotation_age.result
+++ innodb_encrypt_key_rotation_age,undo3.reject
@@ -12,6 +12,9 @@
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
NAME

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.reject 2021-03-19 17:27:14.071534938 +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
@@ -126,12 +126,15 @@
show warnings;
Level Code Message

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,debug.reject 2021-04-10 14:49:04.455785652 +0300
--- r/galera_ist_mariabackup.result
+++ r/galera_ist_mariabackup,debug.reject
@@ -517,3 +517,187 @@
1
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,debug.reject 2021-04-10 14:49:56.740062774 +0300
--- r/galera_ist_mariabackup_innodb_flush_logs.result
+++ r/galera_ist_mariabackup_innodb_flush_logs,debug.reject
@@ -172,3 +172,187 @@
1
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,debug.reject 2021-04-10 14:52:14.236776538 +0300
--- r/galera_ist_rsync.result
+++ r/galera_ist_rsync,debug.reject
@@ -517,3 +517,187 @@
1
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,debug.reject 2021-04-10 14:54:44.825538224 +0300
--- r/galera_sst_mariabackup_data_dir.result
+++ r/galera_sst_mariabackup_data_dir,debug.reject
@@ -516,5 +516,189 @@
1
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,debug.reject 2021-04-10 14:53:30.033162191 +0300
--- r/galera_sst_mariabackup.result
+++ r/galera_sst_mariabackup,debug.reject
@@ -516,5 +516,189 @@
1
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,debug.reject 2021-04-10 15:04:10.276286996 +0300
--- r/galera_sst_rsync2.result
+++ r/galera_sst_rsync2,debug.reject
@@ -516,3 +516,187 @@
1
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,debug.reject 2021-04-10 15:50:26.945234998 +0300
--- r/galera_sst_rsync_data_dir.result
+++ r/galera_sst_rsync_data_dir,debug.reject
@@ -516,3 +516,187 @@
1
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.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;

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,infile,verbose.reject 2012-02-04 12:16:10.000000000 +0100
--- suite/mtr/t/simple.result
+++ suite/mtr/t/simple,infile,verbose.reject
@@ -3,7 +3,7 @@
proxy
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,infile.reject 2012-02-04 12:13:59.000000000 +0100
--- suite/mtr/t/simple,old.result
+++ suite/mtr/t/simple,old,infile.reject
@@ -3,7 +3,7 @@
proxy
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.reject 2019-02-16 11:14:32.869258690 +0100
--- suite/period/r/delete.result
+++ suite/period/r/delete.reject
@@ -250,7 +250,6 @@
ERROR 22003: Out of range value for column 'id' at row 1
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,parallel.reject 2016-10-14 21:17:51.296986686 +0200
--- mysql-test/suite/rpl/r/rpl_delayed_slave.result
+++ mysql-test/suite/rpl/r/rpl_delayed_slave,parallel.reject
@@ -45,7 +45,6 @@
# wait for first query to execute
# 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,stmt.reject 2016-03-25 23:55:18.396360848 +0400
--- suite/rpl/r/rpl_insert_delayed.result
+++ suite/rpl/r/rpl_insert_delayed,stmt.reject
@@ -18,19 +18,19 @@
insert delayed into t1 values(10, "my name");
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,stmt.reject 2022-05-04 18:51:49.520106231 +0300
--- r/rpl_iodku.result
+++ r/rpl_iodku,stmt.reject
@@ -1,10 +1,15 @@
include/master-slave.inc
[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,32bit.reject 2019-08-18 15:20:19.253763968 +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
@@ -20,22 +20,22 @@
master-bin.000001 # Query 1 # use `test`; ALTER TABLE t comment ''
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.reject 2021-02-02 11:02:12.361178360 +0200
--- suite/sys_vars/r/aria_sort_buffer_size_basic.result
+++ suite/sys_vars/r/aria_sort_buffer_size_basic.reject
@@ -44,5 +44,5 @@
set session aria_sort_buffer_size=cast(-1 as unsigned int);
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.reject 2019-05-07 15:10:20.012718538 +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
@@ -1,5 +1,7 @@
set global innodb_ft_result_cache_limit=5000000000;
+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,32bit.reject 2021-02-02 10:55:53.876791633 +0200
--- suite/sys_vars/r/sysvars_aria.result
+++ suite/sys_vars/r/sysvars_aria,32bit.reject
@@ -5,7 +5,7 @@
SESSION_VALUE NULL
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,32bit.reject 2017-09-10 08:06:38.447122100 +0300
--- r\sysvars_debug.result
+++ r\sysvars_debug,32bit.reject
@@ -21,7 +21,7 @@
GLOBAL_VALUE_ORIGIN CONFIG
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,32bit.reject 2014-10-10 19:38:09.000000000 +0300
--- suite/sys_vars/r/sysvars_wsrep.result
+++ suite/sys_vars/r/sysvars_wsrep,32bit.reject
@@ -245,7 +245,7 @@
GLOBAL_VALUE_ORIGIN COMPILE-TIME
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.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:

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.reject 2019-02-28 09:22:16.578113115 +0200
--- r/wsrep-recover-v25.result
+++ r/wsrep-recover-v25.reject
@@ -12,4 +12,16 @@
SELECT VARIABLE_VALUE `expect 6` FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed';
expect 6

4
storage/example/mysql-test/mtr/t/test2.rdiff
View file

@ -1,5 +1,5 @@
--- /usr/home/serg/Abk/mysql/5.1/mysql-test/suite/mtr/t/test2.result 2012-02-04 21:15:14.000000000 +0100
+++ /usr/home/serg/Abk/mysql/5.1/mysql-test/suite/mtr/t/test2.reject 2012-02-04 21:31:45.000000000 +0100
--- /usr/home/serg/Abk/mysql/5.1/mysql-test/suite/mtr/t/test2.result
+++ /usr/home/serg/Abk/mysql/5.1/mysql-test/suite/mtr/t/test2.reject
@@ -1,4 +1,4 @@
select @@local_infile;
select @@max_error_count;

4
storage/innobase/mysql-test/storage_engine/autoinc_secondary.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/autoinc_secondary.result 2012-07-12 04:34:18.153885986 +0400
+++ suite/storage_engine/autoinc_secondary.reject 2012-07-15 17:47:03.937703666 +0400
--- suite/storage_engine/autoinc_secondary.result
+++ suite/storage_engine/autoinc_secondary.reject
@@ -13,18 +13,15 @@
5 a
DROP TABLE t1;

4
storage/innobase/mysql-test/storage_engine/cache_index.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/cache_index.result 2012-07-15 00:22:19.822493731 +0400
+++ suite/storage_engine/cache_index.reject 2012-07-15 17:47:18.321522834 +0400
--- suite/storage_engine/cache_index.result
+++ suite/storage_engine/cache_index.reject
@@ -12,31 +12,31 @@
SET GLOBAL <CACHE_NAME>.key_buffer_size=128*1024;
CACHE INDEX t1 INDEX (a), t2 IN <CACHE_NAME>;

4
storage/innobase/mysql-test/storage_engine/checksum_table_live.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/checksum_table_live.result 2012-07-12 21:05:44.497062968 +0400
+++ suite/storage_engine/checksum_table_live.reject 2012-07-15 17:47:28.105399836 +0400
--- suite/storage_engine/checksum_table_live.result
+++ suite/storage_engine/checksum_table_live.reject
@@ -11,8 +11,8 @@
test.t1 4272806499
CHECKSUM TABLE t1, t2 QUICK;

4
storage/innobase/mysql-test/storage_engine/fulltext_search.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/fulltext_search.result 2013-11-27 18:50:16.000000000 +0400
+++ suite/storage_engine/fulltext_search.reject 2014-02-05 15:33:26.000000000 +0400
--- suite/storage_engine/fulltext_search.result
+++ suite/storage_engine/fulltext_search.reject
@@ -52,15 +52,14 @@
INSERT INTO t1 (v0,v1,v2) VALUES ('text4','Contributing more...','...is a good idea'),('text5','test','test');
SELECT v0, MATCH(v1) AGAINST('contributing') AS rating FROM t1 WHERE MATCH(v1) AGAINST ('contributing');

4
storage/innobase/mysql-test/storage_engine/index_enable_disable.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/index_enable_disable.result 2012-07-15 00:30:05.296641931 +0400
+++ suite/storage_engine/index_enable_disable.reject 2012-07-15 17:49:12.988081281 +0400
--- suite/storage_engine/index_enable_disable.result
+++ suite/storage_engine/index_enable_disable.reject
@@ -11,15 +11,19 @@
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
t1 1 a 1 a # # NULL NULL YES BTREE

4
storage/innobase/mysql-test/storage_engine/index_type_hash.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/index_type_hash.result 2012-07-15 01:10:17.919128889 +0400
+++ suite/storage_engine/index_type_hash.reject 2012-07-15 17:49:26.135915989 +0400
--- suite/storage_engine/index_type_hash.result
+++ suite/storage_engine/index_type_hash.reject
@@ -4,7 +4,7 @@
) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
SHOW KEYS IN t1;

4
storage/innobase/mysql-test/storage_engine/insert_delayed.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/insert_delayed.result 2013-01-23 01:23:49.461254916 +0400
+++ suite/storage_engine/insert_delayed.reject 2013-01-23 01:47:05.975698364 +0400
--- suite/storage_engine/insert_delayed.result
+++ suite/storage_engine/insert_delayed.reject
@@ -5,7 +5,16 @@
connect con0,localhost,root,,;
SET lock_wait_timeout = 1;

4
storage/innobase/mysql-test/storage_engine/lock_concurrent.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/lock_concurrent.result 2012-06-24 23:55:19.539380000 +0400
+++ suite/storage_engine/lock_concurrent.reject 2012-07-15 17:50:21.279222746 +0400
--- suite/storage_engine/lock_concurrent.result
+++ suite/storage_engine/lock_concurrent.reject
@@ -4,6 +4,14 @@
connect con1,localhost,root,,;
SET lock_wait_timeout = 1;

4
storage/innobase/mysql-test/storage_engine/optimize_table.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/optimize_table.result 2012-07-12 19:13:53.741428591 +0400
+++ suite/storage_engine/optimize_table.reject 2012-07-15 17:50:30.843102510 +0400
--- suite/storage_engine/optimize_table.result
+++ suite/storage_engine/optimize_table.reject
@@ -5,25 +5,32 @@
INSERT INTO t1 (a,b) VALUES (3,'c'),(4,'d');
OPTIMIZE TABLE t1;

4
storage/innobase/mysql-test/storage_engine/parts/checksum_table.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/parts/checksum_table.result 2013-11-08 22:30:34.000000000 +0400
+++ suite/storage_engine/parts/checksum_table.reject 2013-11-08 22:32:30.000000000 +0400
--- suite/storage_engine/parts/checksum_table.result
+++ suite/storage_engine/parts/checksum_table.reject
@@ -31,8 +31,8 @@
test.t1 4272806499
CHECKSUM TABLE t1, t2 QUICK;

4
storage/innobase/mysql-test/storage_engine/parts/create_table.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/parts/create_table.result 2012-07-12 21:56:38.618667460 +0400
+++ suite/storage_engine/parts/create_table.reject 2012-07-15 20:06:43.496358345 +0400
--- suite/storage_engine/parts/create_table.result
+++ suite/storage_engine/parts/create_table.reject
@@ -65,7 +65,7 @@
1 SIMPLE t1 abc,def # # # # # # #
EXPLAIN PARTITIONS SELECT a FROM t1 WHERE a = 100;

4
storage/innobase/mysql-test/storage_engine/parts/optimize_table.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/parts/optimize_table.result 2013-07-18 22:55:38.000000000 +0400
+++ suite/storage_engine/parts/optimize_table.reject 2013-08-05 19:45:19.000000000 +0400
--- suite/storage_engine/parts/optimize_table.result
+++ suite/storage_engine/parts/optimize_table.reject
@@ -9,18 +9,22 @@
INSERT INTO t1 (a,b) VALUES (3,'c'),(4,'d');
ALTER TABLE t1 OPTIMIZE PARTITION p1;

4
storage/innobase/mysql-test/storage_engine/parts/repair_table.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/parts/repair_table.result 2013-07-18 22:55:38.000000000 +0400
+++ suite/storage_engine/parts/repair_table.reject 2013-08-05 19:54:09.000000000 +0400
--- suite/storage_engine/parts/repair_table.result
+++ suite/storage_engine/parts/repair_table.reject
@@ -25,7 +25,7 @@
INSERT INTO t1 (a,b) VALUES (10,'j');
ALTER TABLE t1 REPAIR PARTITION p1 QUICK USE_FRM;

4
storage/innobase/mysql-test/storage_engine/repair_table.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/repair_table.result 2013-10-03 20:35:06.000000000 +0400
+++ suite/storage_engine/repair_table.reject 2013-11-08 22:04:22.000000000 +0400
--- suite/storage_engine/repair_table.result
+++ suite/storage_engine/repair_table.reject
@@ -4,56 +4,57 @@
CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
REPAIR TABLE t1;

4
storage/innobase/mysql-test/storage_engine/tbl_opt_index_dir.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/tbl_opt_data_index_dir.result 2013-10-03 20:35:06.000000000 +0400
+++ suite/storage_engine/tbl_opt_data_index_dir.reject 2013-11-08 22:06:54.000000000 +0400
--- suite/storage_engine/tbl_opt_data_index_dir.result
+++ suite/storage_engine/tbl_opt_data_index_dir.reject
@@ -1,10 +1,12 @@
DROP TABLE IF EXISTS t1;
+Warnings:

4
storage/innobase/mysql-test/storage_engine/tbl_opt_insert_method.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/tbl_opt_insert_method.result 2012-06-24 23:55:19.539380000 +0400
+++ suite/storage_engine/tbl_opt_insert_method.reject 2012-07-15 17:51:09.978610512 +0400
--- suite/storage_engine/tbl_opt_insert_method.result
+++ suite/storage_engine/tbl_opt_insert_method.reject
@@ -5,7 +5,7 @@
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,

4
storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff
View file

@ -1,5 +1,5 @@
--- ../storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.result~ 2017-05-24 00:40:12.854181048 +0300
+++ ../storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.reject 2017-05-24 00:49:06.578191030 +0300
--- ../storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.result~
+++ ../storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.reject
@@ -7,19 +7,39 @@
`b` char(8) DEFAULT NULL
) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC

4
storage/innobase/mysql-test/storage_engine/tbl_opt_union.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/tbl_opt_union.result 2012-06-24 23:55:19.539380000 +0400
+++ suite/storage_engine/tbl_opt_union.reject 2012-07-15 17:51:31.014346053 +0400
--- suite/storage_engine/tbl_opt_union.result
+++ suite/storage_engine/tbl_opt_union.reject
@@ -4,11 +4,11 @@
Table Create Table
t1 CREATE TABLE `t1` (

4
storage/innobase/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/trx/cons_snapshot_serializable.result 2013-11-27 18:46:36.000000000 +0400
+++ suite/storage_engine/trx/cons_snapshot_serializable.reject 2013-11-28 19:17:02.000000000 +0400
--- suite/storage_engine/trx/cons_snapshot_serializable.result
+++ suite/storage_engine/trx/cons_snapshot_serializable.reject
@@ -5,12 +5,15 @@
CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;

4
storage/innobase/mysql-test/storage_engine/trx/level_read_committed.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/trx/level_read_committed.result 2013-11-28 19:18:48.000000000 +0400
+++ suite/storage_engine/trx/level_read_committed.reject 2013-11-28 19:18:59.000000000 +0400
--- suite/storage_engine/trx/level_read_committed.result
+++ suite/storage_engine/trx/level_read_committed.reject
@@ -77,6 +77,8 @@
CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;

4
storage/innobase/mysql-test/storage_engine/trx/level_read_uncommitted.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/trx/level_read_uncommitted.result 2013-11-28 19:18:48.000000000 +0400
+++ suite/storage_engine/trx/level_read_uncommitted.reject 2013-11-28 19:19:50.000000000 +0400
--- suite/storage_engine/trx/level_read_uncommitted.result
+++ suite/storage_engine/trx/level_read_uncommitted.reject
@@ -102,6 +102,8 @@
CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;

4
storage/innobase/mysql-test/storage_engine/type_char_indexes.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/type_char_indexes.result 2014-10-12 14:22:11.000000000 +0400
+++ suite/storage_engine/type_char_indexes.reject 2014-10-12 14:23:28.000000000 +0400
--- suite/storage_engine/type_char_indexes.result
+++ suite/storage_engine/type_char_indexes.reject
@@ -137,7 +137,7 @@
r3a
EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16;

4
storage/innobase/mysql-test/storage_engine/type_float_indexes.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/type_float_indexes.result 2012-07-12 19:37:27.031661128 +0400
+++ suite/storage_engine/type_float_indexes.reject 2012-07-15 17:52:12.189828410 +0400
--- suite/storage_engine/type_float_indexes.result
+++ suite/storage_engine/type_float_indexes.reject
@@ -60,7 +60,7 @@
ALTER TABLE t1 ADD UNIQUE KEY(d);
EXPLAIN SELECT d FROM t1 WHERE r > 0 and d > 0 ORDER BY d;

4
storage/myisam/mysql-test/mtr2/single.rdiff
View file

@ -1,5 +1,5 @@
--- suite/mtr2/single.result 2013-11-10 03:58:37.000000000 +0400
+++ suite/mtr2/single.reject 2013-11-10 03:59:08.000000000 +0400
--- suite/mtr2/single.result
+++ suite/mtr2/single.reject
@@ -1,6 +1,6 @@
select 1;
1

4
storage/myisam/mysql-test/storage_engine/alter_table_online.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/alter_table_online.result 2013-11-08 20:01:16.000000000 +0400
+++ suite/storage_engine/alter_table_online.reject 2013-11-08 20:02:03.000000000 +0400
--- suite/storage_engine/alter_table_online.result
+++ suite/storage_engine/alter_table_online.reject
@@ -23,12 +50,30 @@
CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN>, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
INSERT INTO t1 (a,b,c) VALUES (1,100,'a'),(2,200,'b'),(3,300,'c');

4
storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/alter_tablespace.result 2012-07-12 19:53:40.775419511 +0400
+++ suite/storage_engine/alter_tablespace.reject 2012-07-15 16:21:14.910435703 +0400
--- suite/storage_engine/alter_tablespace.result
+++ suite/storage_engine/alter_tablespace.reject
@@ -1,21 +1,14 @@
DROP TABLE IF EXISTS t1, t2;
CREATE TABLE t1 (a <INT_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;

4
storage/myisam/mysql-test/storage_engine/check_table.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/check_table.result 2012-07-15 04:19:07.782936394 +0400
+++ suite/storage_engine/check_table.reject 2012-07-15 16:21:16.734412773 +0400
--- suite/storage_engine/check_table.result
+++ suite/storage_engine/check_table.reject
@@ -18,7 +18,7 @@
INSERT INTO t1 (a,b) VALUES (6,'f');
CHECK TABLE t1 FAST;

4
storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/foreign_keys.result 2012-07-12 18:56:19.782678645 +0400
+++ suite/storage_engine/foreign_keys.reject 2012-07-15 16:21:30.414240794 +0400
--- suite/storage_engine/foreign_keys.result
+++ suite/storage_engine/foreign_keys.reject
@@ -12,29 +12,57 @@
t2 CREATE TABLE `t2` (
`a` int(11) DEFAULT NULL,

4
storage/myisam/mysql-test/storage_engine/index_type_hash.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/index_type_hash.result 2012-07-15 01:10:17.919128889 +0400
+++ suite/storage_engine/index_type_hash.reject 2012-07-15 16:21:32.806210722 +0400
--- suite/storage_engine/index_type_hash.result
+++ suite/storage_engine/index_type_hash.reject
@@ -4,7 +4,7 @@
) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
SHOW KEYS IN t1;

4
storage/myisam/mysql-test/storage_engine/misc.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/misc.result 2018-02-23 03:01:49.673249912 +0200
+++ suite/storage_engine/misc.reject 2018-02-23 03:02:05.669249564 +0200
--- suite/storage_engine/misc.result
+++ suite/storage_engine/misc.reject
@@ -28,6 +28,10 @@
SELECT TABLE_NAME, COLUMN_NAME, REFERENCED_TABLE_NAME, REFERENCED_COLUMN_NAME
FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ORDER BY TABLE_NAME;

4
storage/myisam/mysql-test/storage_engine/show_engine.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/show_engine.result 2012-06-24 23:55:19.539380000 +0400
+++ suite/storage_engine/show_engine.reject 2012-07-15 16:21:54.401939228 +0400
--- suite/storage_engine/show_engine.result
+++ suite/storage_engine/show_engine.reject
@@ -4,7 +4,6 @@
# volatile data (timestamps, memory info, etc.)
SHOW ENGINE <STORAGE_ENGINE> STATUS;

4
storage/myisam/mysql-test/storage_engine/tbl_opt_insert_method.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/tbl_opt_insert_method.result 2012-06-24 23:55:19.539380000 +0400
+++ suite/storage_engine/tbl_opt_insert_method.reject 2012-07-15 16:21:56.381914337 +0400
--- suite/storage_engine/tbl_opt_insert_method.result
+++ suite/storage_engine/tbl_opt_insert_method.reject
@@ -5,7 +5,7 @@
t1 CREATE TABLE `t1` (
`a` int(11) DEFAULT NULL,

4
storage/myisam/mysql-test/storage_engine/tbl_opt_union.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/tbl_opt_union.result 2012-06-24 23:55:19.539380000 +0400
+++ suite/storage_engine/tbl_opt_union.reject 2012-07-15 16:21:58.121892463 +0400
--- suite/storage_engine/tbl_opt_union.result
+++ suite/storage_engine/tbl_opt_union.reject
@@ -4,11 +4,11 @@
Table Create Table
t1 CREATE TABLE `t1` (

4
storage/myisam/mysql-test/storage_engine/trx/cons_snapshot_repeatable_read.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/trx/cons_snapshot_repeatable_read.result 2013-01-22 22:05:05.246633000 +0400
+++ suite/storage_engine/trx/cons_snapshot_repeatable_read.reject 2013-01-23 02:44:05.336711176 +0400
--- suite/storage_engine/trx/cons_snapshot_repeatable_read.result
+++ suite/storage_engine/trx/cons_snapshot_repeatable_read.reject
@@ -1,3 +1,9 @@
+# -- WARNING ----------------------------------------------------------------
+# According to I_S.ENGINES, MyISAM does not support transactions.

4
storage/myisam/mysql-test/storage_engine/trx/cons_snapshot_serializable.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/trx/cons_snapshot_serializable.result 2013-01-22 22:05:05.246633000 +0400
+++ suite/storage_engine/trx/cons_snapshot_serializable.reject 2013-01-23 02:44:05.928703734 +0400
--- suite/storage_engine/trx/cons_snapshot_serializable.result
+++ suite/storage_engine/trx/cons_snapshot_serializable.reject
@@ -1,3 +1,9 @@
+# -- WARNING ----------------------------------------------------------------
+# According to I_S.ENGINES, MyISAM does not support transactions.

4
storage/myisam/mysql-test/storage_engine/trx/delete.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/trx/delete.result 2012-07-12 23:06:18.946113626 +0400
+++ suite/storage_engine/trx/delete.reject 2012-07-15 16:55:46.108397219 +0400
--- suite/storage_engine/trx/delete.result
+++ suite/storage_engine/trx/delete.reject
@@ -1,3 +1,15 @@
+# -- WARNING ----------------------------------------------------------------
+# According to I_S.ENGINES, MyISAM does not support transactions.

4
storage/myisam/mysql-test/storage_engine/trx/insert.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/trx/insert.result 2012-07-12 23:09:44.663527407 +0400
+++ suite/storage_engine/trx/insert.reject 2012-07-15 16:55:46.676390078 +0400
--- suite/storage_engine/trx/insert.result
+++ suite/storage_engine/trx/insert.reject
@@ -1,3 +1,15 @@
+# -- WARNING ----------------------------------------------------------------
+# According to I_S.ENGINES, MyISAM does not support transactions.

4
storage/myisam/mysql-test/storage_engine/trx/level_read_committed.rdiff
View file

@ -1,5 +1,5 @@
--- suite/storage_engine/trx/level_read_committed.result 2013-01-22 22:05:05.246633000 +0400
+++ suite/storage_engine/trx/level_read_committed.reject 2013-01-23 02:44:06.572695636 +0400
--- suite/storage_engine/trx/level_read_committed.result
+++ suite/storage_engine/trx/level_read_committed.reject
@@ -1,3 +1,9 @@
+# -- WARNING ----------------------------------------------------------------
+# According to I_S.ENGINES, MyISAM does not support transactions.

Some files were not shown because too many files have changed in this diff Show more