Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions mysql-test/suite/vcol/r/vcol_misc.result
Original file line number Diff line number Diff line change
Expand Up @@ -591,3 +591,9 @@ DROP TABLE t;
#
# End of 10.5 tests
#
SET tx_isolation='READ-UNCOMMITTED';
CREATE TABLE t (a VARCHAR(10),b INT,c CHAR(10) GENERATED ALWAYS AS (a) VIRTUAL,KEY(b,c)) ENGINE=InnoDB;
INSERT INTO t (a) VALUES ('A');
SELECT * FROM t WHERE b IS NULL ORDER BY a;
a b c
A NULL A
10 changes: 10 additions & 0 deletions mysql-test/suite/vcol/t/vcol_misc.test
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
--source include/have_ucs2.inc
--source include/have_debug.inc
--source include/have_innodb.inc

let $MYSQLD_DATADIR= `select @@datadir`;

Expand Down Expand Up @@ -560,3 +561,12 @@ DROP TABLE t;
--echo #
--echo # End of 10.5 tests
--echo #

#
# MDEV-36896 Assertion `marked_for_read()' failed in virtual String *Field_varstring::val_str(String *, String *)
#

SET tx_isolation='READ-UNCOMMITTED';
CREATE TABLE t (a VARCHAR(10),b INT,c CHAR(10) GENERATED ALWAYS AS (a) VIRTUAL,KEY(b,c)) ENGINE=InnoDB;
INSERT INTO t (a) VALUES ('A');
SELECT * FROM t WHERE b IS NULL ORDER BY a;
1 change: 0 additions & 1 deletion sql/table.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9187,7 +9187,6 @@ int TABLE::update_virtual_field(Field *vf, bool ignore_warnings)
TABLE::update_virtual_fields(handler *, enum_vcol_update_mode).
*/
in_use->set_n_backup_active_arena(expr_arena, &backup_arena);
bitmap_clear_all(&tmp_set);
vf->vcol_info->expr->walk(&Item::update_vcol_processor, 0, &tmp_set);
DBUG_FIX_WRITE_SET(vf);
vf->vcol_info->expr->save_in_field(vf, 0);
Expand Down