Skip to content

M
MariaDB
Commit 17efd43b authored by guilhem@gbichot3.local's avatar guilhem@gbichot3.local
Browse files
Options

post-merge test/result fixes.

parent 1bfe0bdf
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 40 deletions
mysql-test/r/rpl_switch_stm_row_mixed.result
View file @ 17efd43b
...@@ -226,6 +226,13 @@ begin ...@@ -226,6 +226,13 @@ begin
set NEW.data = concat(NEW.data,UUID()); set NEW.data = concat(NEW.data,UUID());
end| end|
insert into t11 values("try_560_"); insert into t11 values("try_560_");
insert delayed into t2 values("delay_1_");
insert delayed into t2 values(concat("delay_2_",UUID()));
insert delayed into t2 values("delay_3_"),(concat("delay_4_",UUID())),("delay_5_");
insert delayed into t2 values("delay_6_");
insert delayed into t2 values(rand());
set @a=2.345;
insert delayed into t2 values(@a);
create table t20 select * from t1; create table t20 select * from t1;
create table t21 select * from t2; create table t21 select * from t2;
create table t22 select * from t3; create table t22 select * from t3;
...@@ -312,24 +319,12 @@ INSERT INTO t16 SELECT * FROM t15; ...@@ -312,24 +319,12 @@ INSERT INTO t16 SELECT * FROM t15;
insert into t16 values("try_65_"); insert into t16 values("try_65_");
drop table t15; drop table t15;
insert into t16 values("try_66_"); insert into t16 values("try_66_");
insert delayed into t2 values("delay_1_");
insert delayed into t2 values(concat("delay_2_",UUID()));
Warnings:
Warning 1265 Data truncated for column 'UUID()' at row 1
insert delayed into t2 values("delay_3_"),(concat("delay_4_",UUID())),("delay_5_");
Warnings:
Warning 1265 Data truncated for column 'UUID()' at row 2
insert delayed into t2 values("delay_6_");
create table t12 (a int, b float);
insert delayed into t12 values(1,rand());
set @a=2.345;
insert delayed into t12 values(2,@a);
select count(*) from t1; select count(*) from t1;
count(*) count(*)
7 7
select count(*) from t2; select count(*) from t2;
count(*) count(*)
7 5
select count(*) from t3; select count(*) from t3;
count(*) count(*)
1 1
...@@ -347,7 +342,7 @@ count(*) ...@@ -347,7 +342,7 @@ count(*)
66 66
select count(*) from t21; select count(*) from t21;
count(*) count(*)
14 22
select count(*) from t22; select count(*) from t22;
count(*) count(*)
2 2
...@@ -360,9 +355,6 @@ count(*) ...@@ -360,9 +355,6 @@ count(*)
select count(*) from t16; select count(*) from t16;
count(*) count(*)
3 3
select count(*) from t12;
count(*)
2
show binlog events from 102; show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # drop database if exists mysqltest1 master-bin.000001 # Query 1 # drop database if exists mysqltest1
...@@ -474,21 +466,6 @@ master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t1) ...@@ -474,21 +466,6 @@ master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t1)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t1) master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t1)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `mysqltest1`; create table t12 (a int, b float)
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t12)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t12)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `mysqltest1`; insert into t1 values(concat("work_250_", NAME_CONST('x',... master-bin.000001 # Query 1 # use `mysqltest1`; insert into t1 values(concat("work_250_", NAME_CONST('x',...
master-bin.000001 # Query 1 # use `mysqltest1`; insert into t1 select "yesterday_270_" master-bin.000001 # Query 1 # use `mysqltest1`; insert into t1 select "yesterday_270_"
master-bin.000001 # Query 1 # use `mysqltest1`; insert into t1 values(concat("work_250_", NAME_CONST('x',... master-bin.000001 # Query 1 # use `mysqltest1`; insert into t1 values(concat("work_250_", NAME_CONST('x',...
...@@ -573,6 +550,20 @@ set NEW.data = concat(NEW.data,UUID()); ...@@ -573,6 +550,20 @@ set NEW.data = concat(NEW.data,UUID());
end end
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t11) master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t11)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `mysqltest1`; create table t20 select * from t1 master-bin.000001 # Query 1 # use `mysqltest1`; create table t20 select * from t1
master-bin.000001 # Query 1 # use `mysqltest1`; create table t21 select * from t2 master-bin.000001 # Query 1 # use `mysqltest1`; create table t21 select * from t2
master-bin.000001 # Query 1 # use `mysqltest1`; create table t22 select * from t3 master-bin.000001 # Query 1 # use `mysqltest1`; create table t22 select * from t3
...@@ -657,10 +648,6 @@ master-bin.000001 # Write_rows 1 # table_id: # ...@@ -657,10 +648,6 @@ master-bin.000001 # Write_rows 1 # table_id: #
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
master-bin.000001 # Query 1 # use `mysqltest1`; alter table t1 modify a int, drop primary key master-bin.000001 # Query 1 # use `mysqltest1`; alter table t1 modify a int, drop primary key
master-bin.000001 # Query 1 # use `mysqltest1`; insert into t1 values(null,"try_57_") master-bin.000001 # Query 1 # use `mysqltest1`; insert into t1 values(null,"try_57_")
master-bin.000001 # Query 1 # use `mysqltest1`; CREATE TEMPORARY TABLE `t15` (
`UUID()` varchar(36) CHARACTER SET utf8 NOT NULL DEFAULT ''
)
master-bin.000001 # Query 1 # use `mysqltest1`; COMMIT
master-bin.000001 # Query 1 # use `mysqltest1`; CREATE TABLE `t16` ( master-bin.000001 # Query 1 # use `mysqltest1`; CREATE TABLE `t16` (
`UUID()` varchar(36) CHARACTER SET utf8 NOT NULL DEFAULT '' `UUID()` varchar(36) CHARACTER SET utf8 NOT NULL DEFAULT ''
) )
......
mysql-test/t/rpl_switch_stm_row_mixed.test
View file @ 17efd43b
...@@ -253,6 +253,7 @@ begin ...@@ -253,6 +253,7 @@ begin
end| end|
delimiter ;| delimiter ;|
insert into t11 values("try_560_"); insert into t11 values("try_560_");
# Test that INSERT DELAYED works in mixed mode (BUG#20649) # Test that INSERT DELAYED works in mixed mode (BUG#20649)
insert delayed into t2 values("delay_1_"); insert delayed into t2 values("delay_1_");
insert delayed into t2 values(concat("delay_2_",UUID())); insert delayed into t2 values(concat("delay_2_",UUID()));
...@@ -262,10 +263,9 @@ insert delayed into t2 values("delay_6_"); ...@@ -262,10 +263,9 @@ insert delayed into t2 values("delay_6_");
# Test for BUG#20633 (INSERT DELAYED RAND()/user_variable does not # Test for BUG#20633 (INSERT DELAYED RAND()/user_variable does not
# replicate fine in statement-based ; we test that in mixed mode it # replicate fine in statement-based ; we test that in mixed mode it
# works). # works).
create table t12 (a int, b float); insert delayed into t2 values(rand());
insert delayed into t12 values(1,rand());
set @a=2.345; set @a=2.345;
insert delayed into t12 values(2,@a); insert delayed into t2 values(@a);
sleep 4; # time for the delayed inserts to reach disk sleep 4; # time for the delayed inserts to reach disk
...@@ -455,7 +455,6 @@ select count(*) from t12; ...@@ -455,7 +455,6 @@ select count(*) from t12;
select count(*) from t13; select count(*) from t13;
#select count(*) from t14; #select count(*) from t14;
select count(*) from t16; select count(*) from t16;
select count(*) from t12;
if ($you_want_to_test_UDF) if ($you_want_to_test_UDF)
{ {
select count(*) from t6; select count(*) from t6;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7