database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-28 17:36:30 +03:00
Code Activity

Merge branch bb-10.2-release into bb-10.3-release

Browse Source
This commit is contained in:
Nikita Malyavin
2021-05-04 14:49:31 +03:00
parent 2820f30dde 72fa9dabad
commit a8a925dd22
88 changed files with 1696 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/suite/vcol/r/binlog.result
View File

@@ -67,4 +67,17 @@ connection master;
DROP VIEW v1;
set @@binlog_row_image=default;
DROP TABLE t1;
SET SQL_MODE=default;
CREATE TABLE t1 (pk INT, a VARCHAR(3), b VARCHAR(1) AS (a) VIRTUAL, PRIMARY KEY (pk));
INSERT IGNORE INTO t1 (pk, a) VALUES (1,'foo'),(2,'bar');
Warnings:
Warning 1265 Data truncated for column 'b' at row 1
Warning 1265 Data truncated for column 'b' at row 2
REPLACE INTO t1 (pk) VALUES (2);
ERROR 22001: Data too long for column 'b' at row 1
UPDATE IGNORE t1 SET a = NULL;
Warnings:
Warning 1265 Data truncated for column 'b' at row 1
Warning 1265 Data truncated for column 'b' at row 2
DROP TABLE t1;
include/rpl_end.inc

14
mysql-test/suite/vcol/t/binlog.test
View File

@@ -51,5 +51,19 @@ DROP VIEW v1;
set @@binlog_row_image=default;
DROP TABLE t1;
SET SQL_MODE=default;
# MDEV-24782
# ASAN use-after-poison in Field::pack_int / THD::binlog_update_row
CREATE TABLE t1 (pk INT, a VARCHAR(3), b VARCHAR(1) AS (a) VIRTUAL, PRIMARY KEY (pk));
INSERT IGNORE INTO t1 (pk, a) VALUES (1,'foo'),(2,'bar');
--error ER_DATA_TOO_LONG
REPLACE INTO t1 (pk) VALUES (2);
UPDATE IGNORE t1 SET a = NULL;
# Cleanup
DROP TABLE t1;
--source include/rpl_end.inc