database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

MDEV-30321: blob data corrupted by row_merge_write_blob_to_tmp_file()

Browse Source
This commit is contained in:
Michael Roosz
2023-01-04 10:06:34 +01:00
committed by Thirunarayanan B
parent 65683807e9
commit b5a54e8a93
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/suite/innodb/r/insert_into_empty.result
View File

@@ -387,4 +387,19 @@ Table Op Msg_type Msg_text
test.t1 check status OK
DROP TABLE t1;
SET GLOBAL INNODB_DEFAULT_ROW_FORMAT= @format;
#
# MDEV-30321 blob data corrupted by row_merge_write_blob_to_tmp_file()
#
CREATE TABLE t1 (
`id` int(11) NOT NULL,
`data` LONGBLOB NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB;
INSERT INTO t1 VALUES
(1, REPEAT('X', @@innodb_sort_buffer_size)),
(2, REPEAT('X', @@innodb_sort_buffer_size));
SELECT COUNT(*) AS nb_corrupted_rows FROM t1 WHERE data != REPEAT('X', @@innodb_sort_buffer_size);
nb_corrupted_rows
0
DROP TABLE t1;
# End of 10.7 tests

17
mysql-test/suite/innodb/t/insert_into_empty.test
View File

@@ -405,4 +405,21 @@ CHECK TABLE t1;
DROP TABLE t1;
SET GLOBAL INNODB_DEFAULT_ROW_FORMAT= @format;
--echo #
--echo # MDEV-30321 blob data corrupted by row_merge_write_blob_to_tmp_file()
--echo #
CREATE TABLE t1 (
`id` int(11) NOT NULL,
`data` LONGBLOB NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB;
INSERT INTO t1 VALUES
(1, REPEAT('X', @@innodb_sort_buffer_size)),
(2, REPEAT('X', @@innodb_sort_buffer_size));
SELECT COUNT(*) AS nb_corrupted_rows FROM t1 WHERE data != REPEAT('X', @@innodb_sort_buffer_size);
DROP TABLE t1;
--echo # End of 10.7 tests

2
storage/innobase/row/row0merge.cc
View File

@@ -1066,7 +1066,7 @@ static dberr_t row_merge_write_blob_to_tmp_file(
uint32_t len= field->len;
dberr_t err= os_file_write(
IORequestWrite, "(bulk insert)", blob_file->fd,
field->data, blob_file->offset * srv_page_size, len);
field->data, blob_file->offset, len);
if (err != DB_SUCCESS)
return err;