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.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-03-19 13:35:18 +02:00
parent dbe941e06f 233c09138f
commit 00528a0445
246 changed files with 5086 additions and 6852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/rpl/r/rpl_ignore_grant.result
View File

@@ -1,14 +1,12 @@
include/master-slave.inc
[connection master]
connection master;
set global sql_mode="";
set local sql_mode="";
set sql_mode="";
delete from mysql.user where user=_binary'rpl_ignore_grant';
delete from mysql.db where user=_binary'rpl_ignore_grant';
flush privileges;
connection slave;
set global sql_mode="";
set local sql_mode="";
set sql_mode="";
delete from mysql.user where user=_binary'rpl_ignore_grant';
delete from mysql.db where user=_binary'rpl_ignore_grant';
flush privileges;
@@ -43,7 +41,5 @@ connection slave;
delete from mysql.user where user=_binary'rpl_ignore_grant';
delete from mysql.db where user=_binary'rpl_ignore_grant';
flush privileges;
set global sql_mode=default;
connection master;
set global sql_mode=default;
include/rpl_end.inc

1
mysql-test/suite/rpl/r/rpl_master_pos_wait.result
View File

@@ -12,6 +12,7 @@ Note 1003 select master_pos_wait('master-bin.999999',0,2) AS `master_pos_wait('m
select master_pos_wait('master-bin.999999',0);
connection slave1;
stop slave sql_thread;
include/wait_for_slave_sql_to_stop.inc
connection slave;
master_pos_wait('master-bin.999999',0)
NULL

4
mysql-test/suite/rpl/r/rpl_row_USER.result
View File

@@ -1,6 +1,5 @@
include/master-slave.inc
[connection master]
set global sql_mode="";
set local sql_mode="";
connection master;
DROP DATABASE IF EXISTS mysqltest1;
@@ -40,7 +39,6 @@ REVOKE ALL ON mysqltest1.* FROM 'tester'@'%';
REVOKE ALL ON mysqltest1.* FROM ''@'localhost%';
DROP USER tester@'%';
DROP USER ''@'localhost%';
FLUSH PRIVILEGES;
connection slave;
include/rpl_end.inc
set global sql_mode=default;
set local sql_mode=default;

18
mysql-test/suite/rpl/r/rpl_sp.result
View File

@@ -1,7 +1,6 @@
include/master-slave.inc
[connection master]
set local sql_mode='';
set global sql_mode='';
drop database if exists mysqltest1;
create database mysqltest1;
use mysqltest1;
@@ -175,16 +174,16 @@ fn1(20)
insert into t2 values(fn1(21));
select * from t1;
a
21
20
21
select * from t2;
a
23
connection slave;
select * from t1;
a
21
20
21
select * from t2;
a
23
@@ -243,7 +242,7 @@ return unix_timestamp();
end NONE
mysqltest1 fn2 FUNCTION fn2 SQL NO_SQL NO DEFINER int(11) begin
return unix_timestamp();
end zedjzlcsjhd@localhost # # latin1 latin1_swedish_ci latin1_swedish_ci begin
end zedjzlcsjhd@localhost # # STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION latin1 latin1_swedish_ci latin1_swedish_ci begin
return unix_timestamp();
end NONE
mysqltest1 fn3 FUNCTION fn3 SQL READS_SQL_DATA NO DEFINER int(11) begin
@@ -268,7 +267,7 @@ return unix_timestamp();
end NONE
mysqltest1 fn2 FUNCTION fn2 SQL NO_SQL NO DEFINER int(11) begin
return unix_timestamp();
end zedjzlcsjhd@localhost # # latin1 latin1_swedish_ci latin1_swedish_ci begin
end zedjzlcsjhd@localhost # # STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION latin1 latin1_swedish_ci latin1_swedish_ci begin
return unix_timestamp();
end NONE
mysqltest1 fn3 FUNCTION fn3 SQL READS_SQL_DATA NO DEFINER int(11) begin
@@ -865,6 +864,7 @@ SET TIMESTAMP=t/*!*/;
grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1
/*!*/;
SET TIMESTAMP=t/*!*/;
SET @@session.sql_mode=1411383296/*!*/;
CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` PROCEDURE `foo4`()
DETERMINISTIC
begin
@@ -883,6 +883,7 @@ COMMIT
START TRANSACTION
/*!*/;
SET TIMESTAMP=t/*!*/;
SET @@session.sql_mode=0/*!*/;
insert into t1 values (15)
/*!*/;
SET TIMESTAMP=t/*!*/;
@@ -891,17 +892,20 @@ COMMIT
START TRANSACTION
/*!*/;
SET TIMESTAMP=t/*!*/;
SET @@session.sql_mode=1411383296/*!*/;
insert into t2 values(3)
/*!*/;
SET TIMESTAMP=t/*!*/;
COMMIT
/*!*/;
SET TIMESTAMP=t/*!*/;
SET @@session.sql_mode=0/*!*/;
alter procedure foo4 sql security invoker
/*!*/;
START TRANSACTION
/*!*/;
SET TIMESTAMP=t/*!*/;
SET @@session.sql_mode=1411383296/*!*/;
insert into t2 values(3)
/*!*/;
SET TIMESTAMP=t/*!*/;
@@ -918,6 +922,7 @@ COMMIT
START TRANSACTION
/*!*/;
SET TIMESTAMP=t/*!*/;
SET @@session.sql_mode=0/*!*/;
delete from t2
/*!*/;
SET TIMESTAMP=t/*!*/;
@@ -1015,6 +1020,7 @@ SET TIMESTAMP=t/*!*/;
COMMIT
/*!*/;
SET TIMESTAMP=t/*!*/;
SET @@session.sql_mode=1411383296/*!*/;
CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` FUNCTION `fn2`() RETURNS int(11)
NO SQL
begin
@@ -1022,6 +1028,7 @@ return unix_timestamp();
end
/*!*/;
SET TIMESTAMP=t/*!*/;
SET @@session.sql_mode=0/*!*/;
CREATE DEFINER=`root`@`localhost` FUNCTION `fn3`() RETURNS int(11)
READS SQL DATA
begin
@@ -1384,4 +1391,3 @@ drop procedure p1;
# End of 5.5 tests.
connection slave;
include/rpl_end.inc
set global sql_mode=default;

24
mysql-test/suite/rpl/t/rpl_ignore_grant.test
View File

@@ -6,16 +6,12 @@ source include/master-slave.inc;
# do not be influenced by other tests.
connection master;
set global sql_mode="";
set local sql_mode="";
set sql_mode="";
delete from mysql.user where user=_binary'rpl_ignore_grant';
delete from mysql.db where user=_binary'rpl_ignore_grant';
flush privileges;
save_master_pos;
connection slave;
set global sql_mode="";
set local sql_mode="";
sync_with_master;
--sync_slave_with_master
set sql_mode="";
# as these DELETE were not replicated, we need to do them manually on the
# slave.
delete from mysql.user where user=_binary'rpl_ignore_grant';
@@ -27,9 +23,7 @@ connection master;
grant select on *.* to rpl_ignore_grant@localhost;
grant drop on test.* to rpl_ignore_grant@localhost;
show grants for rpl_ignore_grant@localhost;
save_master_pos;
connection slave;
sync_with_master;
--sync_slave_with_master
--error 1141 #("no such grant for user")
show grants for rpl_ignore_grant@localhost;
# check it another way
@@ -43,9 +37,7 @@ select count(*) from mysql.db where user=_binary'rpl_ignore_grant';
grant select on *.* to rpl_ignore_grant@localhost;
connection master;
set password for rpl_ignore_grant@localhost=password("does it work?");
save_master_pos;
connection slave;
sync_with_master;
--sync_slave_with_master
select password<>_binary'' from mysql.user where user=_binary'rpl_ignore_grant';
# clear what we have done, to not influence other tests.
@@ -53,15 +45,11 @@ connection master;
delete from mysql.user where user=_binary'rpl_ignore_grant';
delete from mysql.db where user=_binary'rpl_ignore_grant';
flush privileges;
save_master_pos;
connection slave;
sync_with_master;
--sync_slave_with_master
delete from mysql.user where user=_binary'rpl_ignore_grant';
delete from mysql.db where user=_binary'rpl_ignore_grant';
flush privileges;
set global sql_mode=default;
connection master;
set global sql_mode=default;
# End of 4.1 tests
--source include/rpl_end.inc

8
mysql-test/suite/rpl/t/rpl_ignore_table_update.test
View File

@@ -24,15 +24,11 @@ create table mysqltest_bar (m int);
insert into mysqltest_bar values(15);
create table t1 (k int);
insert into t1 values(55);
save_master_pos;
connection slave;
sync_with_master;
--sync_slave_with_master
select mysqltest_foo.n,mysqltest_bar.m,t1.k from mysqltest_foo,mysqltest_bar,t1;
connection master;
drop table mysqltest_foo,mysqltest_bar,t1;
save_master_pos;
connection slave;
sync_with_master;
--sync_slave_with_master
drop table mysqltest_foo,mysqltest_bar,t1;
# End of 4.1 tests

1
mysql-test/suite/rpl/t/rpl_master_pos_wait.test
View File

@@ -10,6 +10,7 @@ explain extended select master_pos_wait('master-bin.999999',0,2);
send select master_pos_wait('master-bin.999999',0);
connection slave1;
stop slave sql_thread;
--source include/wait_for_slave_sql_to_stop.inc
connection slave;
reap;

12
mysql-test/suite/rpl/t/rpl_row_USER.test
View File

@@ -11,7 +11,6 @@
# Includes
-- source include/have_binlog_format_row.inc
-- source include/master-slave.inc
set global sql_mode="";
set local sql_mode="";
# Begin clean up test section
@@ -43,23 +42,18 @@ delimiter ;|
CALL mysqltest1.p1();
connection master;
SELECT * FROM mysqltest1.t1 ORDER BY a;
sync_slave_with_master;
--sync_slave_with_master
SELECT * FROM mysqltest1.t1 ORDER BY a;
connection master;
# Lets cleanup
#show binlog events;
DROP DATABASE mysqltest1;
REVOKE ALL ON mysqltest1.* FROM 'tester'@'%';
REVOKE ALL ON mysqltest1.* FROM ''@'localhost%';
DROP USER tester@'%';
DROP USER ''@'localhost%';
sync_slave_with_master;
FLUSH PRIVILEGES;
--sync_slave_with_master
# End of 5.0 test case
--source include/rpl_end.inc
set global sql_mode=default;
set local sql_mode=default;

2
mysql-test/suite/rpl/t/rpl_row_trig002.test
View File

@@ -48,9 +48,11 @@ INSERT INTO test.t3 VALUES ('Yes', 1, NULL, 'spamfilter','scan_incoming');
INSERT INTO test.t2 VALUES ('Yes', 1, NULL, 'spamfilter','scan_incoming');
select * from test.t2;
--sorted_result
select * from test.t3;
sync_slave_with_master;
select * from test.t2;
--sorted_result
select * from test.t3;
connection master;

5
mysql-test/suite/rpl/t/rpl_sp.test
View File

@@ -7,8 +7,6 @@ source include/have_binlog_format_mixed.inc;
source include/master-slave.inc;
set local sql_mode='';
set global sql_mode='';
# we need a db != test, where we don't have automatic grants
--disable_warnings
drop database if exists mysqltest1;
@@ -199,9 +197,11 @@ delimiter ;|
delete t1,t2 from t1,t2;
select fn1(20);
insert into t2 values(fn1(21));
--sorted_result
select * from t1;
select * from t2;
sync_slave_with_master;
--sorted_result
select * from t1;
select * from t2;
@@ -728,4 +728,3 @@ drop procedure p1;
# Cleanup
sync_slave_with_master;
--source include/rpl_end.inc
set global sql_mode=default;