Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MDEV-16248 Row based replication to spider with float column fails on…
… delete/update (#1354)
- Loading branch information
Showing
17 changed files
with
632 additions
and
3 deletions.
There are no files selected for viewing
13 changes: 13 additions & 0 deletions
13
storage/spider/mysql-test/spider/bugfix/include/delete_with_float_column_deinit.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
--let $CHILD2_1_SELECT_TABLES= $CHILD2_1_SELECT_TABLES_BACKUP | ||
--connection master_1 | ||
set session binlog_format= @old_binlog_format; | ||
--connection slave1_1 | ||
--disable_warnings | ||
--disable_query_log | ||
--disable_result_log | ||
--source ../include/deinit_spider.inc | ||
--source ../t/slave_test_deinit.inc | ||
--source ../t/test_deinit.inc | ||
--enable_result_log | ||
--enable_query_log | ||
--enable_warnings |
24 changes: 24 additions & 0 deletions
24
storage/spider/mysql-test/spider/bugfix/include/delete_with_float_column_init.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
--disable_warnings | ||
--disable_query_log | ||
--disable_result_log | ||
--source ../t/test_init.inc | ||
--source ../t/slave_test_init.inc | ||
--enable_result_log | ||
--enable_query_log | ||
--enable_warnings | ||
--let $CHILD2_1_SELECT_TABLES_BACKUP= $CHILD2_1_SELECT_TABLES | ||
let $CHILD2_1_SELECT_TABLES= | ||
SELECT pkey, f FROM tbl_a ORDER BY pkey; | ||
let $CHILD2_1_SELECT_ARGUMENT1= | ||
SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %'; | ||
--connection slave1_1 | ||
--disable_warnings | ||
--disable_query_log | ||
--disable_result_log | ||
--source ../include/init_spider.inc | ||
--enable_result_log | ||
--enable_query_log | ||
--enable_warnings | ||
--connection master_1 | ||
set @old_binlog_format= @@binlog_format; | ||
set session binlog_format= 'ROW'; |
4 changes: 4 additions & 0 deletions
4
storage/spider/mysql-test/spider/bugfix/include/delete_with_float_column_mariadb_deinit.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
--let $MASTER_1_COMMENT_2_1= $MASTER_1_COMMENT_2_1_BACKUP | ||
--let $CHILD2_1_DROP_TABLES= $CHILD2_1_DROP_TABLES_BACKUP | ||
--let $CHILD2_1_CREATE_TABLES= $CHILD2_1_CREATE_TABLES_BACKUP | ||
--source delete_with_float_column_deinit.inc |
14 changes: 14 additions & 0 deletions
14
storage/spider/mysql-test/spider/bugfix/include/delete_with_float_column_mariadb_init.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
--source delete_with_float_column_init.inc | ||
--let $MASTER_1_COMMENT_2_1_BACKUP= $MASTER_1_COMMENT_2_1 | ||
let $MASTER_1_COMMENT_2_1= | ||
COMMENT='table "tbl_a", srv "s_2_1", wrapper "mariadb"'; | ||
--let $CHILD2_1_DROP_TABLES_BACKUP= $CHILD2_1_DROP_TABLES | ||
let $CHILD2_1_DROP_TABLES= | ||
DROP TABLE IF EXISTS tbl_a; | ||
--let $CHILD2_1_CREATE_TABLES_BACKUP= $CHILD2_1_CREATE_TABLES | ||
let $CHILD2_1_CREATE_TABLES= | ||
CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
f float DEFAULT NULL, | ||
PRIMARY KEY (pkey) | ||
) $CHILD2_1_ENGINE $CHILD2_1_CHARSET; |
4 changes: 4 additions & 0 deletions
4
storage/spider/mysql-test/spider/bugfix/include/delete_with_float_column_mysql_deinit.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
--let $MASTER_1_COMMENT_2_1= $MASTER_1_COMMENT_2_1_BACKUP | ||
--let $CHILD2_1_DROP_TABLES= $CHILD2_1_DROP_TABLES_BACKUP | ||
--let $CHILD2_1_CREATE_TABLES= $CHILD2_1_CREATE_TABLES_BACKUP | ||
--source delete_with_float_column_deinit.inc |
16 changes: 16 additions & 0 deletions
16
storage/spider/mysql-test/spider/bugfix/include/delete_with_float_column_mysql_init.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
--source delete_with_float_column_init.inc | ||
--let $MASTER_1_COMMENT_2_1_BACKUP= $MASTER_1_COMMENT_2_1 | ||
let $MASTER_1_COMMENT_2_1= | ||
COMMENT='table "tbl_a", srv "s_2_1", wrapper "mysql"'; | ||
--let $CHILD2_1_DROP_TABLES_BACKUP= $CHILD2_1_DROP_TABLES | ||
let $CHILD2_1_DROP_TABLES= | ||
DROP TABLE IF EXISTS tbl_a $STR_SEMICOLON | ||
DROP FUNCTION to_float; | ||
--let $CHILD2_1_CREATE_TABLES_BACKUP= $CHILD2_1_CREATE_TABLES | ||
let $CHILD2_1_CREATE_TABLES= | ||
CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
f float DEFAULT NULL, | ||
PRIMARY KEY (pkey) | ||
) $CHILD2_1_ENGINE $CHILD2_1_CHARSET $STR_SEMICOLON | ||
CREATE FUNCTION to_float(a decimal(20,6)) RETURNS float RETURN cast(a as double); |
85 changes: 85 additions & 0 deletions
85
storage/spider/mysql-test/spider/bugfix/r/delete_with_float_column_mariadb.result
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
for master_1 | ||
for child2 | ||
child2_1 | ||
child2_2 | ||
child2_3 | ||
for child3 | ||
for slave1_1 | ||
connection slave1_1; | ||
connection master_1; | ||
set @old_binlog_format= @@binlog_format; | ||
set session binlog_format= 'ROW'; | ||
|
||
drop and create databases | ||
connection master_1; | ||
CREATE DATABASE auto_test_local; | ||
USE auto_test_local; | ||
connection slave1_1; | ||
CREATE DATABASE auto_test_local; | ||
USE auto_test_local; | ||
connection child2_1; | ||
SET @old_log_output = @@global.log_output; | ||
SET GLOBAL log_output = 'TABLE,FILE'; | ||
CREATE DATABASE auto_test_remote; | ||
USE auto_test_remote; | ||
|
||
create table and insert | ||
connection child2_1; | ||
CHILD2_1_CREATE_TABLES | ||
TRUNCATE TABLE mysql.general_log; | ||
connection master_1; | ||
connection slave1_1; | ||
connection master_1; | ||
SET SESSION sql_log_bin= 0; | ||
CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
f float DEFAULT NULL, | ||
PRIMARY KEY (pkey) | ||
) MASTER_1_ENGINE2 MASTER_1_CHARSET MASTER_1_COMMENT_2_1 | ||
SET SESSION sql_log_bin= 1; | ||
connection slave1_1; | ||
CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
f float DEFAULT NULL, | ||
PRIMARY KEY (pkey) | ||
) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1 | ||
connection master_1; | ||
INSERT INTO tbl_a (pkey, f) VALUES (0,NULL); | ||
INSERT INTO tbl_a (pkey, f) VALUES (1,0.671437); | ||
DELETE FROM tbl_a WHERE pkey = 0; | ||
DELETE FROM tbl_a WHERE pkey = 1; | ||
connection slave1_1; | ||
connection master_1; | ||
SET SESSION sql_log_bin= 0; | ||
connection child2_1; | ||
SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %'; | ||
argument | ||
delete from `auto_test_remote`.`tbl_a` where `pkey` = 0 and `f` is null limit 1 | ||
delete from `auto_test_remote`.`tbl_a` where `pkey` = 1 and `f` = cast(0.671437 as float) limit 1 | ||
SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %' | ||
SELECT pkey, f FROM tbl_a ORDER BY pkey; | ||
pkey f | ||
connection slave1_1; | ||
SELECT pkey, f FROM tbl_a ORDER BY pkey; | ||
pkey f | ||
|
||
deinit | ||
connection master_1; | ||
DROP DATABASE IF EXISTS auto_test_local; | ||
connection slave1_1; | ||
DROP DATABASE IF EXISTS auto_test_local; | ||
connection child2_1; | ||
DROP DATABASE IF EXISTS auto_test_remote; | ||
SET GLOBAL log_output = @old_log_output; | ||
connection master_1; | ||
set session binlog_format= @old_binlog_format; | ||
connection slave1_1; | ||
for slave1_1 | ||
for master_1 | ||
for child2 | ||
child2_1 | ||
child2_2 | ||
child2_3 | ||
for child3 | ||
|
||
end of test |
85 changes: 85 additions & 0 deletions
85
storage/spider/mysql-test/spider/bugfix/r/delete_with_float_column_mysql.result
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
for master_1 | ||
for child2 | ||
child2_1 | ||
child2_2 | ||
child2_3 | ||
for child3 | ||
for slave1_1 | ||
connection slave1_1; | ||
connection master_1; | ||
set @old_binlog_format= @@binlog_format; | ||
set session binlog_format= 'ROW'; | ||
|
||
drop and create databases | ||
connection master_1; | ||
CREATE DATABASE auto_test_local; | ||
USE auto_test_local; | ||
connection slave1_1; | ||
CREATE DATABASE auto_test_local; | ||
USE auto_test_local; | ||
connection child2_1; | ||
SET @old_log_output = @@global.log_output; | ||
SET GLOBAL log_output = 'TABLE,FILE'; | ||
CREATE DATABASE auto_test_remote; | ||
USE auto_test_remote; | ||
|
||
create table and insert | ||
connection child2_1; | ||
CHILD2_1_CREATE_TABLES | ||
TRUNCATE TABLE mysql.general_log; | ||
connection master_1; | ||
connection slave1_1; | ||
connection master_1; | ||
SET SESSION sql_log_bin= 0; | ||
CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
f float DEFAULT NULL, | ||
PRIMARY KEY (pkey) | ||
) MASTER_1_ENGINE2 MASTER_1_CHARSET MASTER_1_COMMENT_2_1 | ||
SET SESSION sql_log_bin= 1; | ||
connection slave1_1; | ||
CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
f float DEFAULT NULL, | ||
PRIMARY KEY (pkey) | ||
) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1 | ||
connection master_1; | ||
INSERT INTO tbl_a (pkey, f) VALUES (0,NULL); | ||
INSERT INTO tbl_a (pkey, f) VALUES (1,0.671437); | ||
DELETE FROM tbl_a WHERE pkey = 0; | ||
DELETE FROM tbl_a WHERE pkey = 1; | ||
connection slave1_1; | ||
connection master_1; | ||
SET SESSION sql_log_bin= 0; | ||
connection child2_1; | ||
SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %'; | ||
argument | ||
delete from `auto_test_remote`.`tbl_a` where `pkey` = 0 and `f` is null limit 1 | ||
delete from `auto_test_remote`.`tbl_a` where `pkey` = 1 and `f` = /* create function to_float(a decimal(20,6)) returns float return cast(a as double) */ to_float(0.671437) limit 1 | ||
SELECT argument FROM mysql.general_log WHERE argument LIKE '%delete %' | ||
SELECT pkey, f FROM tbl_a ORDER BY pkey; | ||
pkey f | ||
connection slave1_1; | ||
SELECT pkey, f FROM tbl_a ORDER BY pkey; | ||
pkey f | ||
|
||
deinit | ||
connection master_1; | ||
DROP DATABASE IF EXISTS auto_test_local; | ||
connection slave1_1; | ||
DROP DATABASE IF EXISTS auto_test_local; | ||
connection child2_1; | ||
DROP DATABASE IF EXISTS auto_test_remote; | ||
SET GLOBAL log_output = @old_log_output; | ||
connection master_1; | ||
set session binlog_format= @old_binlog_format; | ||
connection slave1_1; | ||
for slave1_1 | ||
for master_1 | ||
for child2 | ||
child2_1 | ||
child2_2 | ||
child2_3 | ||
for child3 | ||
|
||
end of test |
98 changes: 98 additions & 0 deletions
98
storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column.inc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
--echo | ||
--echo drop and create databases | ||
--connection master_1 | ||
--disable_warnings | ||
CREATE DATABASE auto_test_local; | ||
USE auto_test_local; | ||
|
||
--connection slave1_1 | ||
CREATE DATABASE auto_test_local; | ||
USE auto_test_local; | ||
|
||
--connection child2_1 | ||
SET @old_log_output = @@global.log_output; | ||
SET GLOBAL log_output = 'TABLE,FILE'; | ||
CREATE DATABASE auto_test_remote; | ||
USE auto_test_remote; | ||
--enable_warnings | ||
|
||
--echo | ||
--echo create table and insert | ||
|
||
--connection child2_1 | ||
--disable_query_log | ||
echo CHILD2_1_CREATE_TABLES; | ||
eval $CHILD2_1_CREATE_TABLES; | ||
--enable_query_log | ||
TRUNCATE TABLE mysql.general_log; | ||
|
||
--connection master_1 | ||
save_master_pos; | ||
|
||
--connection slave1_1 | ||
sync_with_master; | ||
|
||
--connection master_1 | ||
SET SESSION sql_log_bin= 0; | ||
--disable_query_log | ||
echo CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
f float DEFAULT NULL, | ||
PRIMARY KEY (pkey) | ||
) MASTER_1_ENGINE2 MASTER_1_CHARSET MASTER_1_COMMENT_2_1; | ||
eval CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
f float DEFAULT NULL, | ||
PRIMARY KEY (pkey) | ||
) $MASTER_1_ENGINE2 $MASTER_1_CHARSET $MASTER_1_COMMENT_2_1; | ||
--enable_query_log | ||
SET SESSION sql_log_bin= 1; | ||
|
||
--connection slave1_1 | ||
--disable_query_log | ||
echo CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
f float DEFAULT NULL, | ||
PRIMARY KEY (pkey) | ||
) MASTER_1_ENGINE MASTER_1_CHARSET MASTER_1_COMMENT_2_1; | ||
eval CREATE TABLE tbl_a ( | ||
pkey int NOT NULL, | ||
f float DEFAULT NULL, | ||
PRIMARY KEY (pkey) | ||
) $MASTER_1_ENGINE $MASTER_1_CHARSET $MASTER_1_COMMENT_2_1; | ||
--enable_query_log | ||
|
||
--connection master_1 | ||
INSERT INTO tbl_a (pkey, f) VALUES (0,NULL); | ||
INSERT INTO tbl_a (pkey, f) VALUES (1,0.671437); | ||
DELETE FROM tbl_a WHERE pkey = 0; | ||
DELETE FROM tbl_a WHERE pkey = 1; | ||
save_master_pos; | ||
|
||
--connection slave1_1 | ||
sync_with_master; | ||
|
||
--connection master_1 | ||
SET SESSION sql_log_bin= 0; | ||
|
||
--connection child2_1 | ||
eval $CHILD2_1_SELECT_ARGUMENT1; | ||
eval $CHILD2_1_SELECT_TABLES; | ||
|
||
--connection slave1_1 | ||
SELECT pkey, f FROM tbl_a ORDER BY pkey; | ||
|
||
--echo | ||
--echo deinit | ||
--disable_warnings | ||
--connection master_1 | ||
DROP DATABASE IF EXISTS auto_test_local; | ||
|
||
--connection slave1_1 | ||
DROP DATABASE IF EXISTS auto_test_local; | ||
|
||
--connection child2_1 | ||
DROP DATABASE IF EXISTS auto_test_remote; | ||
SET GLOBAL log_output = @old_log_output; | ||
|
||
--enable_warnings |
4 changes: 4 additions & 0 deletions
4
storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mariadb.cnf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
!include include/default_mysqld.cnf | ||
!include ../my_1_1.cnf | ||
!include ../my_2_1.cnf | ||
!include ../my_4_1.cnf |
5 changes: 5 additions & 0 deletions
5
storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mariadb.test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--source ../include/delete_with_float_column_mariadb_init.inc | ||
--source delete_with_float_column.inc | ||
--source ../include/delete_with_float_column_mariadb_deinit.inc | ||
--echo | ||
--echo end of test |
4 changes: 4 additions & 0 deletions
4
storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mysql.cnf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
!include include/default_mysqld.cnf | ||
!include ../my_1_1.cnf | ||
!include ../my_2_1.cnf | ||
!include ../my_4_1.cnf |
5 changes: 5 additions & 0 deletions
5
storage/spider/mysql-test/spider/bugfix/t/delete_with_float_column_mysql.test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--source ../include/delete_with_float_column_mysql_init.inc | ||
--source delete_with_float_column.inc | ||
--source ../include/delete_with_float_column_mysql_deinit.inc | ||
--echo | ||
--echo end of test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.