mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 12:27:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.4' into 10.5

Browse source
This commit is contained in:
Oleksandr Byelkin 2023-07-27 13:12:30 +02:00
commit f291c3df2c
423 changed files with 1551 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mysql-test/suite/versioning/t/foreign.test
View file

@ -396,15 +396,21 @@ INSERT INTO t2 VALUES (1,'against'),(2,'q');
SET SQL_MODE= '';
SET timestamp = 2;
--disable_ps2_protocol
SELECT * INTO OUTFILE 't1.data' FROM t1;
--enable_ps2_protocol
SET timestamp = 3;
UPDATE t1 SET f13 = 'q';
SET timestamp = 4;
LOAD DATA INFILE 't1.data' REPLACE INTO TABLE t1;
--disable_ps2_protocol
SELECT * INTO OUTFILE 't1.data.2' FROM t1;
--enable_ps2_protocol
SET timestamp = 5;
LOAD DATA INFILE 't1.data.2' REPLACE INTO TABLE t1;
--disable_ps2_protocol
SELECT * INTO OUTFILE 't2.data' FROM t2;
--enable_ps2_protocol
SET timestamp = 6;
LOAD DATA INFILE 't2.data' REPLACE INTO TABLE t2;
SET FOREIGN_KEY_CHECKS = OFF;
@ -547,7 +553,9 @@ delete from t0;
--error ER_ROW_IS_REFERENCED_2
replace t0 values (1);
--disable_ps2_protocol
select * into outfile 'load_t0' from t0 ;
--enable_ps2_protocol
--error ER_ROW_IS_REFERENCED_2
load data infile 'load_t0' replace into table t0;

2
mysql-test/suite/versioning/t/load_data.test
View file

@ -4,7 +4,9 @@
CREATE TABLE t1 (a INT, b INT, c INT, vc INT AS (c), UNIQUE(a), UNIQUE(b)) WITH SYSTEM VERSIONING;
INSERT IGNORE INTO t1 (a,b,c) VALUES (1,2,3);
--disable_ps2_protocol
SELECT a, b, c FROM t1 INTO OUTFILE '15330.data';
--enable_ps2_protocol
LOAD DATA INFILE '15330.data' IGNORE INTO TABLE t1 (a,b,c);
LOAD DATA INFILE '15330.data' REPLACE INTO TABLE t1 (a,b,c);

4
mysql-test/suite/versioning/t/partition.test
View file

@ -995,7 +995,9 @@ create or replace table t1 (
insert into t1 () values (),(),(),(),(),(),(),(),(),(),(),(),(),(),(),();
--disable_ps2_protocol
select * into outfile 'load.data' from t1;
--enable_ps2_protocol
load data infile 'load.data' replace into table t1;
--error ER_RECORD_FILE_FULL
load data infile 'load.data' replace into table t1;
@ -1337,7 +1339,9 @@ partition by system_time limit 100 (
partition pn current);
insert into t1 select seq from seq_0_to_49;
--disable_ps2_protocol
select x into outfile 'MDEV-20077.data' from t1;
--enable_ps2_protocol
load data infile 'MDEV-20077.data' replace into table t1 (x);
load data infile 'MDEV-20077.data' replace into table t1 (x);