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 branch '10.7' into 10.8

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-02-04 14:50:25 +01:00
parent c0f5fd2754 9ed8deb656
commit 4fb2cb1a30
907 changed files with 20182 additions and 6211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
mysql-test/suite/federated/optimizer.result Normal file
View File

@@ -0,0 +1,52 @@
connect master,127.0.0.1,root,,test,$MASTER_MYPORT,;
connect slave,127.0.0.1,root,,test,$SLAVE_MYPORT,;
connection master;
CREATE DATABASE federated;
connection slave;
CREATE DATABASE federated;
connection default;
#
# MDEV-14907 FEDERATEDX doesn't respect DISTINCT
#
CREATE TABLE t1 (
`foo_id` bigint(20) unsigned NOT NULL,
`foo_name` varchar(255) DEFAULT NULL,
`parent_foo_id` bigint(20) unsigned DEFAULT NULL,
PRIMARY KEY (`foo_id`),
KEY `foo_name` (`foo_name`),
KEY `parent_foo_id` (`parent_foo_id`)
) DEFAULT CHARSET=utf8;
CREATE TABLE `fed_t1` ENGINE=FEDERATED DEFAULT CHARSET=utf8 CONNECTION='mysql://root@127.0.0.1:MASTER_PORT/test/t1';
INSERT INTO t1 VALUES (968903, 'STRING - 0', 822857);
INSERT INTO t1 VALUES (968953, 'STRING - 1', 822857);
INSERT INTO t1 VALUES (971603, 'STRING - 2', 822857);
INSERT INTO t1 VALUES (971803, 'STRING - 3', 822857);
INSERT INTO t1 VALUES (975103, 'STRING - 4', 822857);
INSERT INTO t1 VALUES (822857, 'STRING', NULL);
select foo_id,parent_foo_id,foo_name from t1 where parent_foo_id = 822857 or foo_name like 'STRING%';
foo_id parent_foo_id foo_name
968903 822857 STRING - 0
968953 822857 STRING - 1
971603 822857 STRING - 2
971803 822857 STRING - 3
975103 822857 STRING - 4
822857 NULL STRING
explain
select foo_id,parent_foo_id,foo_name from fed_t1 where parent_foo_id = 822857 or foo_name like 'STRING%';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE fed_t1 ALL foo_name,parent_foo_id NULL NULL NULL 6 Using where
select foo_id,parent_foo_id,foo_name from fed_t1 where parent_foo_id = 822857 or foo_name like 'STRING%';
foo_id parent_foo_id foo_name
968903 822857 STRING - 0
968953 822857 STRING - 1
971603 822857 STRING - 2
971803 822857 STRING - 3
975103 822857 STRING - 4
822857 NULL STRING
DROP TABLE fed_t1, t1;
connection master;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated;
connection slave;
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated;

39
mysql-test/suite/federated/optimizer.test Normal file
View File

@@ -0,0 +1,39 @@
#
#Test optimizer flags related to federated tables
#
--source have_federatedx.inc
--source include/federated.inc
connection default;
--echo #
--echo # MDEV-14907 FEDERATEDX doesn't respect DISTINCT
--echo #
CREATE TABLE t1 (
`foo_id` bigint(20) unsigned NOT NULL,
`foo_name` varchar(255) DEFAULT NULL,
`parent_foo_id` bigint(20) unsigned DEFAULT NULL,
PRIMARY KEY (`foo_id`),
KEY `foo_name` (`foo_name`),
KEY `parent_foo_id` (`parent_foo_id`)
) DEFAULT CHARSET=utf8;
--replace_result $MASTER_MYPORT MASTER_PORT
eval CREATE TABLE `fed_t1` ENGINE=FEDERATED DEFAULT CHARSET=utf8 CONNECTION='mysql://root@127.0.0.1:$MASTER_MYPORT/test/t1';
INSERT INTO t1 VALUES (968903, 'STRING - 0', 822857);
INSERT INTO t1 VALUES (968953, 'STRING - 1', 822857);
INSERT INTO t1 VALUES (971603, 'STRING - 2', 822857);
INSERT INTO t1 VALUES (971803, 'STRING - 3', 822857);
INSERT INTO t1 VALUES (975103, 'STRING - 4', 822857);
INSERT INTO t1 VALUES (822857, 'STRING', NULL);
select foo_id,parent_foo_id,foo_name from t1 where parent_foo_id = 822857 or foo_name like 'STRING%';
explain
select foo_id,parent_foo_id,foo_name from fed_t1 where parent_foo_id = 822857 or foo_name like 'STRING%';
select foo_id,parent_foo_id,foo_name from fed_t1 where parent_foo_id = 822857 or foo_name like 'STRING%';
DROP TABLE fed_t1, t1;
source include/federated_cleanup.inc;

18
mysql-test/suite/federated/rpl.result Normal file
View File

@@ -0,0 +1,18 @@
include/master-slave.inc
[connection master]
create table t1 (a int primary key, b int);
connection slave;
rename table t1 to t2;
create table t1 (a int primary key, b int) engine=federated connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/test/t2';
connection master;
insert t1 values (1,1),(2,2),(3,1);
delete from t1 where a=2;
connection slave;
select * from t1;
a b
1 1
3 1
drop table t2;
connection master;
drop table t1;
include/rpl_end.inc

19
mysql-test/suite/federated/rpl.test Normal file
View File

@@ -0,0 +1,19 @@
source include/have_binlog_format_row.inc;
source include/master-slave.inc;
create table t1 (a int primary key, b int);
sync_slave_with_master;
rename table t1 to t2;
evalp create table t1 (a int primary key, b int) engine=federated connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/test/t2';
connection master;
insert t1 values (1,1),(2,2),(3,1);
delete from t1 where a=2;
sync_slave_with_master;
select * from t1;
drop table t2;
connection master;
drop table t1;
source include/rpl_end.inc;