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

MDEV-11675. Convert the new session var to bool type and test changes

Browse Source 
The new @@binlog_alter_two_phase is converted to `my_bool` type.
This commit is contained in:
Andrei
2022-01-31 19:27:22 +02:00
parent a64991df9d
commit fe2d90cca9
40 changed files with 112 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/rpl/r/rpl_alter_rollback.result
View File

@@ -5,8 +5,8 @@
include/master-slave.inc
[connection master]
connection master;
set global binlog_alter_two_phase=YES;
set binlog_alter_two_phase=YES;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
create table t1 (f1 int primary key) engine=InnoDB;
create table t2 (f1 int primary key,
constraint c1 foreign key (f1) references t1(f1),
@@ -50,5 +50,5 @@ connection master;
drop table t2, t1;
connection slave;
connection master;
set global binlog_alter_two_phase=No;;
set global binlog_alter_two_phase=0;;
include/rpl_end.inc

6
mysql-test/suite/rpl/r/rpl_start_alter_1.result
View File

@@ -1,8 +1,8 @@
include/master-slave.inc
[connection master]
connection master;
set global binlog_alter_two_phase=YES;
set binlog_alter_two_phase=YES;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
connection slave;
set global gtid_strict_mode=1;
# Legacy Master Slave
@@ -309,5 +309,5 @@ connection slave;
include/sync_with_master_gtid.inc
set global gtid_strict_mode = 0;;
connection master;
set global binlog_alter_two_phase=No;;
set global binlog_alter_two_phase=0;;
include/rpl_end.inc

6
mysql-test/suite/rpl/r/rpl_start_alter_2.result
View File

@@ -1,8 +1,8 @@
include/master-slave.inc
[connection master]
connection master;
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
connection slave;
set global gtid_strict_mode=1;
connection slave;
@@ -322,5 +322,5 @@ set global gtid_strict_mode = 0;;
set global gtid_domain_id= 0;
include/start_slave.inc
connection master;
set global binlog_alter_two_phase=No;;
set global binlog_alter_two_phase=0;;
include/rpl_end.inc

6
mysql-test/suite/rpl/r/rpl_start_alter_3.result
View File

@@ -1,8 +1,8 @@
include/master-slave.inc
[connection master]
connection master;
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
connection slave;
set global gtid_strict_mode=1;
connection slave;
@@ -322,5 +322,5 @@ set global gtid_strict_mode = 0;;
set global gtid_domain_id= 0;
include/start_slave.inc
connection master;
set global binlog_alter_two_phase=No;;
set global binlog_alter_two_phase=0;;
include/rpl_end.inc

6
mysql-test/suite/rpl/r/rpl_start_alter_4.result
View File

@@ -1,8 +1,8 @@
include/master-slave.inc
[connection master]
connection master;
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
connection slave;
set global gtid_strict_mode=1;
connection slave;
@@ -322,6 +322,6 @@ set global gtid_strict_mode = 0;;
set global gtid_domain_id= 0;
include/start_slave.inc
connection master;
set global binlog_alter_two_phase=No;;
set global binlog_alter_two_phase=0;;
set global gtid_domain_id= 0;
include/rpl_end.inc

6
mysql-test/suite/rpl/r/rpl_start_alter_5.result
View File

@@ -1,8 +1,8 @@
include/master-slave.inc
[connection master]
connection master;
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
connection slave;
set global gtid_strict_mode=1;
connection slave;
@@ -322,6 +322,6 @@ set global gtid_strict_mode = 0;;
set global gtid_domain_id= 0;
include/start_slave.inc
connection master;
set global binlog_alter_two_phase=No;;
set global binlog_alter_two_phase=0;;
set global gtid_domain_id= 0;
include/rpl_end.inc

6
mysql-test/suite/rpl/r/rpl_start_alter_6.result
View File

@@ -1,8 +1,8 @@
include/master-slave.inc
[connection master]
connection master;
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
connection slave;
set global gtid_strict_mode=1;
connection slave;
@@ -324,6 +324,6 @@ set global slave_domain_parallel_threads = 0;;
set global gtid_domain_id= 0;
include/start_slave.inc
connection master;
set global binlog_alter_two_phase=No;;
set global binlog_alter_two_phase=0;;
set global gtid_domain_id= 0;
include/rpl_end.inc

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

@@ -2,8 +2,8 @@ connect server_1,127.0.0.1,root,,,$SERVER_MYPORT_1;
connect server_2,127.0.0.1,root,,,$SERVER_MYPORT_2;
connect server_3,127.0.0.1,root,,,$SERVER_MYPORT_3;
connection server_1;
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
connection server_2;
stop slave;
Warnings:
@@ -356,12 +356,12 @@ reset master;
RESET SLAVE ALL;
SET GLOBAL gtid_slave_pos= '';
connection server_1;
set global binlog_alter_two_phase=No;;
set global binlog_alter_two_phase=0;;
set global gtid_domain_id= 0;
reset master;
connection server_2;
set global gtid_domain_id= 0;
set global binlog_alter_two_phase=No;;
set global binlog_alter_two_phase=0;
reset master;
disconnect server_1;
disconnect server_2;

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

@@ -2,8 +2,8 @@ connect server_1,127.0.0.1,root,,,$SERVER_MYPORT_1;
connect server_2,127.0.0.1,root,,,$SERVER_MYPORT_2;
connect server_3,127.0.0.1,root,,,$SERVER_MYPORT_3;
connection server_1;
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
connection server_2;
stop slave;
Warnings:
@@ -350,12 +350,12 @@ reset master;
RESET SLAVE ALL;
SET GLOBAL gtid_slave_pos= '';
connection server_1;
set global binlog_alter_two_phase=No;;
set global binlog_alter_two_phase=0;;
set global gtid_domain_id= 0;
reset master;
connection server_2;
set global gtid_domain_id= 0;
set global binlog_alter_two_phase=No;;
set global binlog_alter_two_phase=0;;
reset master;
disconnect server_1;
disconnect server_2;

6
mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result
View File

@@ -7,8 +7,8 @@ set global slave_parallel_mode=optimistic;
change master to master_use_gtid=slave_pos;
include/start_slave.inc
connection server_1;
set global binlog_alter_two_phase=YES;
set binlog_alter_two_phase=YES;
set global binlog_alter_two_phase=ON;
set binlog_alter_two_phase=ON;
connect master_node,127.0.0.1,root,,$db_name, $SERVER_MYPORT_1;
connect slave_node,127.0.0.1,root,,test, $SERVER_MYPORT_2;
# innodb
@@ -58,7 +58,7 @@ include/sync_with_master_gtid.inc
disconnect master_node;
disconnect slave_node;
connection server_1;
set global binlog_alter_two_phase=No;;
set global binlog_alter_two_phase=0;
include/rpl_sync.inc
connection server_2;
select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;

6
mysql-test/suite/rpl/r/rpl_start_alter_mysqlbinlog_2.result
View File

@@ -3,8 +3,8 @@ connect server_2,127.0.0.1,root,,,$SERVER_MYPORT_2;
connect server_3,127.0.0.1,root,,,$SERVER_MYPORT_3;
connection server_1;
SET @save_binlog_alter_two_phase= @@GLOBAL.binlog_alter_two_phase;
SET GLOBAL binlog_alter_two_phase=Yes;
SET binlog_alter_two_phase=Yes;
SET GLOBAL binlog_alter_two_phase = ON;
SET binlog_alter_two_phase = ON;
# Create table and perform CA and RA
CREATE TABLE t1( a INT, b INT) ENGINE=InnoDB;
INSERT INTO t1 VALUES(1,1);
@@ -47,7 +47,7 @@ RESET MASTER;
RESET SLAVE;
connection server_2;
SET @save_binlog_alter_two_phase= @@GLOBAL.binlog_alter_two_phase;
SET GLOBAL binlog_alter_two_phase=Yes;
SET GLOBAL binlog_alter_two_phase = ON;
connection server_3;
SET @save_gtid_strict_mode= @@GLOBAL.gtid_strict_mode;
SET @slave_parallel_threads= @@GLOBAL.slave_parallel_threads;

2
mysql-test/suite/rpl/r/rpl_start_alter_optimize.result
View File

@@ -1,7 +1,7 @@
include/master-slave.inc
[connection master]
connection master;
set binlog_alter_two_phase=YES;
set binlog_alter_two_phase = ON;
connection master;
CREATE TABLE t1 (i int) engine=innodb;
CREATE TABLE t2 (i int) engine=innodb;

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

@@ -3,9 +3,9 @@ include/master-slave.inc
connection master;
CREATE TABLE t1 (a1 int, d1 int DEFAULT 0);
INSERT INTO t1 VALUES (1,1) ;
SET binlog_alter_two_phase=YES;
SET binlog_alter_two_phase = ON;
ALTER TABLE t1 WAIT 9 RENAME COLUMN a1 TO a2;
SET binlog_alter_two_phase=NO;
SET binlog_alter_two_phase = OFF;
ALTER TABLE t1 ALTER COLUMN d1 DROP DEFAULT;
connection slave;
connection master;

2
mysql-test/suite/rpl/r/rpl_start_alter_restart_master.result
View File

@@ -73,7 +73,7 @@ t3 CREATE TABLE `t3` (
connection master;
SET GLOBAL debug_dbug= @old_debug_master;
drop table t3;
set global binlog_alter_two_phase = No;;
set global binlog_alter_two_phase = 0;
connection slave;
SET GLOBAL debug_dbug= @old_debug_slave;
stop slave;

2
mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result
View File

@@ -106,7 +106,7 @@ slave-bin.000001 # Gtid 1 # GTID #-#-#
slave-bin.000001 # Query 1 # use `test`; create table t3( a int primary key, b int) engine=innodb
connection master;
drop table t1,t2,t3;
set global binlog_alter_two_phase = No;;
set global binlog_alter_two_phase = 0;
SET GLOBAL debug_dbug= @old_debug_master;
set DEBUG_SYNC= 'RESET';
connection slave;

4
mysql-test/suite/rpl/t/rpl_alter_rollback.test
View File

@@ -11,8 +11,8 @@
--connection master
--let $binlog_alter_two_phase= `select @@binlog_alter_two_phase`
set global binlog_alter_two_phase=YES;
set binlog_alter_two_phase=YES;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
create table t1 (f1 int primary key) engine=InnoDB;
--error ER_CANT_CREATE_TABLE

4
mysql-test/suite/rpl/t/rpl_start_alter_1.test
View File

@@ -7,8 +7,8 @@
--connection master
--let $binlog_alter_two_phase= `select @@binlog_alter_two_phase`
set global binlog_alter_two_phase=YES;
set binlog_alter_two_phase=YES;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
--connection slave
--let $gtid_strict_mode= `select @@gtid_strict_mode`
set global gtid_strict_mode=1;

4
mysql-test/suite/rpl/t/rpl_start_alter_2.test
View File

@@ -9,8 +9,8 @@
--source include/master-slave.inc
--connection master
--let $binlog_alter_two_phase= `select @@binlog_alter_two_phase`
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
--connection slave
--let $gtid_strict_mode= `select @@gtid_strict_mode`
--let $slave_parallel_threads= `select @@slave_parallel_threads`

4
mysql-test/suite/rpl/t/rpl_start_alter_3.test
View File

@@ -10,8 +10,8 @@
--source include/have_debug.inc
--connection master
--let $binlog_alter_two_phase= `select @@binlog_alter_two_phase`
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
--connection slave
--let $gtid_strict_mode= `select @@gtid_strict_mode`
--let $slave_parallel_threads= `select @@slave_parallel_threads`

4
mysql-test/suite/rpl/t/rpl_start_alter_4.test
View File

@@ -10,8 +10,8 @@
--source include/have_debug.inc
--connection master
--let $binlog_alter_two_phase= `select @@binlog_alter_two_phase`
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
--connection slave
--let $gtid_strict_mode= `select @@gtid_strict_mode`
--let $slave_parallel_threads= `select @@slave_parallel_threads`

4
mysql-test/suite/rpl/t/rpl_start_alter_5.test
View File

@@ -10,8 +10,8 @@
--source include/have_debug.inc
--connection master
--let $binlog_alter_two_phase= `select @@binlog_alter_two_phase`
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
--connection slave
--let $gtid_strict_mode= `select @@gtid_strict_mode`
--let $slave_parallel_threads= `select @@slave_parallel_threads`

4
mysql-test/suite/rpl/t/rpl_start_alter_6.test
View File

@@ -11,8 +11,8 @@
--source include/have_debug.inc
--connection master
--let $binlog_alter_two_phase= `select @@binlog_alter_two_phase`
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
--connection slave
--let $gtid_strict_mode= `select @@gtid_strict_mode`
--let $slave_parallel_threads= `select @@slave_parallel_threads`

6
mysql-test/suite/rpl/t/rpl_start_alter_7.test
View File

@@ -13,8 +13,8 @@
--connection server_1
--let $binlog_alter_two_phase= `select @@binlog_alter_two_phase`
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
--connection server_2
stop slave;
@@ -104,7 +104,7 @@ set global gtid_domain_id= 0;
reset master;
--connection server_2
set global gtid_domain_id= 0;
--eval set global binlog_alter_two_phase=$binlog_alter_two_phase;
--eval set global binlog_alter_two_phase=$binlog_alter_two_phase
reset master;
--disconnect server_1

4
mysql-test/suite/rpl/t/rpl_start_alter_8.test
View File

@@ -13,8 +13,8 @@
--connection server_1
--let $binlog_alter_two_phase= `select @@binlog_alter_two_phase`
set global binlog_alter_two_phase=Yes;
set binlog_alter_two_phase=Yes;
set global binlog_alter_two_phase = ON;
set binlog_alter_two_phase = ON;
--connection server_2
stop slave;

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

@@ -1,6 +1,6 @@
#
# MENT-662 Lag Free alter for slave
# In this we will see if chain replication works as
# In this we will see if chain replication works as
# M->S(Legacy)->S(Parallel)->S(Legacy, without log-slave-upadates)
#
--source include/have_innodb.inc
@@ -22,8 +22,8 @@ change master to master_use_gtid=slave_pos;
--connection server_1
--let $binlog_alter_two_phase= `select @@binlog_alter_two_phase`
set global binlog_alter_two_phase=YES;
set binlog_alter_two_phase=YES;
set global binlog_alter_two_phase=ON;
set binlog_alter_two_phase=ON;
--let $engine=innodb
--let $sync_slave= 1
connect(master_node,127.0.0.1,root,,$db_name, $SERVER_MYPORT_1);
@@ -32,7 +32,7 @@ connect(slave_node,127.0.0.1,root,,test, $SERVER_MYPORT_2);
--disconnect master_node
--disconnect slave_node
--connection server_1
--eval set global binlog_alter_two_phase=$binlog_alter_two_phase;
--eval set global binlog_alter_two_phase=$binlog_alter_two_phase
--source include/rpl_sync.inc

6
mysql-test/suite/rpl/t/rpl_start_alter_mysqlbinlog_2.test
View File

@@ -19,8 +19,8 @@
--connection server_1
SET @save_binlog_alter_two_phase= @@GLOBAL.binlog_alter_two_phase;
SET GLOBAL binlog_alter_two_phase=Yes;
SET binlog_alter_two_phase=Yes;
SET GLOBAL binlog_alter_two_phase = ON;
SET binlog_alter_two_phase = ON;
--echo # Create table and perform CA and RA
CREATE TABLE t1( a INT, b INT) ENGINE=InnoDB;
INSERT INTO t1 VALUES(1,1);
@@ -54,7 +54,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/master_1.sql;
--connection server_2
SET @save_binlog_alter_two_phase= @@GLOBAL.binlog_alter_two_phase;
SET GLOBAL binlog_alter_two_phase=Yes;
SET GLOBAL binlog_alter_two_phase = ON;
--connection server_3
SET @save_gtid_strict_mode= @@GLOBAL.gtid_strict_mode;

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

@@ -8,7 +8,7 @@
--source include/master-slave.inc
--connection master
set binlog_alter_two_phase=YES;
set binlog_alter_two_phase = ON;
--connection master
CREATE TABLE t1 (i int) engine=innodb;

4
mysql-test/suite/rpl/t/rpl_start_alter_para_to_seq.test
View File

@@ -9,9 +9,9 @@
--connection master
CREATE TABLE t1 (a1 int, d1 int DEFAULT 0);
INSERT INTO t1 VALUES (1,1) ;
SET binlog_alter_two_phase=YES;
SET binlog_alter_two_phase = ON;
ALTER TABLE t1 WAIT 9 RENAME COLUMN a1 TO a2;
SET binlog_alter_two_phase=NO;
SET binlog_alter_two_phase = OFF;
ALTER TABLE t1 ALTER COLUMN d1 DROP DEFAULT;
--sync_slave_with_master

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

@@ -60,7 +60,7 @@ show create table t3;
--connection master
SET GLOBAL debug_dbug= @old_debug_master;
drop table t3;
--eval set global binlog_alter_two_phase = $binlog_alter_two_phase;
--eval set global binlog_alter_two_phase = $binlog_alter_two_phase
--sync_slave_with_master
SET GLOBAL debug_dbug= @old_debug_slave;

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

@@ -107,7 +107,7 @@ if (`select $master_gtid_state <> $slave_gtid_state`)
--connection master
drop table t1,t2,t3;
--eval set global binlog_alter_two_phase = $binlog_alter_two_phase;
--eval set global binlog_alter_two_phase = $binlog_alter_two_phase
SET GLOBAL debug_dbug= @old_debug_master;
set DEBUG_SYNC= 'RESET';