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-12436: binlog.binlog_unsafe - assumed len(hostname) <= 50 (#385)

Browse Source 
Increased size in tests to allow for 100 character hostname.

Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
This commit is contained in:
Daniel Black
2017-07-16 02:45:37 +10:00
committed by elenst
parent c8c6a9fdf4
commit 2f07709aed
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/suite/binlog/r/binlog_unsafe.result
View File

@@ -1,14 +1,14 @@
#### Setup tables #### #### Setup tables ####
CREATE TABLE t0 (a CHAR(100)); CREATE TABLE t0 (a CHAR(200));
CREATE TABLE t1 (a CHAR(100)); CREATE TABLE t1 (a CHAR(200));
CREATE TABLE t2 (a CHAR(100)); CREATE TABLE t2 (a CHAR(200));
CREATE TABLE t3 (a CHAR(100)); CREATE TABLE t3 (a CHAR(200));
CREATE TABLE ta0 (a CHAR(100)); CREATE TABLE ta0 (a CHAR(200));
CREATE TABLE ta1 (a CHAR(100)); CREATE TABLE ta1 (a CHAR(200));
CREATE TABLE ta2 (a CHAR(100)); CREATE TABLE ta2 (a CHAR(200));
CREATE TABLE ta3 (a CHAR(100)); CREATE TABLE ta3 (a CHAR(200));
CREATE TABLE autoinc_table (a INT PRIMARY KEY AUTO_INCREMENT); CREATE TABLE autoinc_table (a INT PRIMARY KEY AUTO_INCREMENT);
CREATE TABLE data_table (a CHAR(100)); CREATE TABLE data_table (a CHAR(200));
INSERT INTO data_table VALUES ('foo'); INSERT INTO data_table VALUES ('foo');
CREATE TABLE trigger_table_1 (a INT); CREATE TABLE trigger_table_1 (a INT);
CREATE TABLE trigger_table_2 (a INT); CREATE TABLE trigger_table_2 (a INT);
@@ -2392,7 +2392,7 @@ Note 1592 Unsafe statement written to the binary log using statement format sinc
DROP PROCEDURE p1; DROP PROCEDURE p1;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a VARCHAR(100), b VARCHAR(100)); CREATE TABLE t1 (a VARCHAR(200), b VARCHAR(200));
INSERT INTO t1 VALUES ('a','b'); INSERT INTO t1 VALUES ('a','b');
UPDATE t1 SET b = '%s%s%s%s%s%s%s%s%s%s%s%s%s%s' WHERE a = 'a' LIMIT 1; UPDATE t1 SET b = '%s%s%s%s%s%s%s%s%s%s%s%s%s%s' WHERE a = 'a' LIMIT 1;
Warnings: Warnings:
@@ -2423,7 +2423,7 @@ CREATE FUNCTION fun_check_log_bin() RETURNS INT
BEGIN BEGIN
SET @@SQL_LOG_BIN = 0; SET @@SQL_LOG_BIN = 0;
INSERT INTO t1 VALUES(@@global.sync_binlog); INSERT INTO t1 VALUES(@@global.sync_binlog);
RETURN 100; RETURN 200;
END| END|
"One unsafe warning should be issued in the following statement" "One unsafe warning should be issued in the following statement"
SELECT fun_check_log_bin(); SELECT fun_check_log_bin();

22
mysql-test/suite/binlog/t/binlog_unsafe.test
View File

@@ -110,16 +110,16 @@ call mtr.add_suppression("Unsafe statement written to the binary log using state
--echo #### Setup tables #### --echo #### Setup tables ####
CREATE TABLE t0 (a CHAR(100)); CREATE TABLE t0 (a CHAR(200));
CREATE TABLE t1 (a CHAR(100)); CREATE TABLE t1 (a CHAR(200));
CREATE TABLE t2 (a CHAR(100)); CREATE TABLE t2 (a CHAR(200));
CREATE TABLE t3 (a CHAR(100)); CREATE TABLE t3 (a CHAR(200));
CREATE TABLE ta0 (a CHAR(100)); CREATE TABLE ta0 (a CHAR(200));
CREATE TABLE ta1 (a CHAR(100)); CREATE TABLE ta1 (a CHAR(200));
CREATE TABLE ta2 (a CHAR(100)); CREATE TABLE ta2 (a CHAR(200));
CREATE TABLE ta3 (a CHAR(100)); CREATE TABLE ta3 (a CHAR(200));
CREATE TABLE autoinc_table (a INT PRIMARY KEY AUTO_INCREMENT); CREATE TABLE autoinc_table (a INT PRIMARY KEY AUTO_INCREMENT);
CREATE TABLE data_table (a CHAR(100)); CREATE TABLE data_table (a CHAR(200));
INSERT INTO data_table VALUES ('foo'); INSERT INTO data_table VALUES ('foo');
CREATE TABLE trigger_table_1 (a INT); CREATE TABLE trigger_table_1 (a INT);
CREATE TABLE trigger_table_2 (a INT); CREATE TABLE trigger_table_2 (a INT);
@@ -433,7 +433,7 @@ DROP TABLE t1;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
--enable_warnings --enable_warnings
CREATE TABLE t1 (a VARCHAR(100), b VARCHAR(100)); CREATE TABLE t1 (a VARCHAR(200), b VARCHAR(200));
INSERT INTO t1 VALUES ('a','b'); INSERT INTO t1 VALUES ('a','b');
UPDATE t1 SET b = '%s%s%s%s%s%s%s%s%s%s%s%s%s%s' WHERE a = 'a' LIMIT 1; UPDATE t1 SET b = '%s%s%s%s%s%s%s%s%s%s%s%s%s%s' WHERE a = 'a' LIMIT 1;
DROP TABLE t1; DROP TABLE t1;
@@ -471,7 +471,7 @@ CREATE FUNCTION fun_check_log_bin() RETURNS INT
BEGIN BEGIN
SET @@SQL_LOG_BIN = 0; SET @@SQL_LOG_BIN = 0;
INSERT INTO t1 VALUES(@@global.sync_binlog); INSERT INTO t1 VALUES(@@global.sync_binlog);
RETURN 100; RETURN 200;
END| END|
DELIMITER ;| DELIMITER ;|
--echo "One unsafe warning should be issued in the following statement" --echo "One unsafe warning should be issued in the following statement"