1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-19011 Assertion `file->s->base.reclength < file->s->vreclength' failed

Browse Source 
The assertion is improved: storage engines like myisam always have to store
at least one field, so the assertion does not cover tables with no stored
columns.
This commit is contained in:
Nikita Malyavin 2021-03-23 16:48:02 +03:00
parent 6ba5f81c7d
commit f85afa5124
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/gcol/inc/gcol_keys.inc
View File

@ -809,4 +809,12 @@ eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/load.data' REPLACE INTO TABLE t1 (p
--remove_file $MYSQLTEST_VARDIR/tmp/load.data --remove_file $MYSQLTEST_VARDIR/tmp/load.data
DROP TABLE t1; DROP TABLE t1;
--echo # MDEV-19011 Assertion `file->s->base.reclength < file->s->vreclength'
--echo # failed in ha_myisam::setup_vcols_for_repair
CREATE TABLE t1 (a INT GENERATED ALWAYS AS (1) VIRTUAL) ENGINE=MyISAM;
ALTER TABLE t1 ADD KEY (a);
DROP TABLE t1;
} }

5
mysql-test/suite/gcol/r/gcol_keys_innodb.result
View File

@ -875,6 +875,11 @@ Warning 1264 Out of range value for column 'vi' at row 1
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/load.data' REPLACE INTO TABLE t1 (pk,i,ts); LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/load.data' REPLACE INTO TABLE t1 (pk,i,ts);
ERROR 22003: Out of range value for column 'vi' at row 1 ERROR 22003: Out of range value for column 'vi' at row 1
DROP TABLE t1; DROP TABLE t1;
# MDEV-19011 Assertion `file->s->base.reclength < file->s->vreclength'
# failed in ha_myisam::setup_vcols_for_repair
CREATE TABLE t1 (a INT GENERATED ALWAYS AS (1) VIRTUAL) ENGINE=MyISAM;
ALTER TABLE t1 ADD KEY (a);
DROP TABLE t1;
# #
# BUG#21365158 WL8149:ASSERTION `!TABLE || (!TABLE->WRITE_SET # BUG#21365158 WL8149:ASSERTION `!TABLE || (!TABLE->WRITE_SET
# #

5
mysql-test/suite/gcol/r/gcol_keys_myisam.result
View File

@ -877,6 +877,11 @@ Warning 1264 Out of range value for column 'vi' at row 1
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/load.data' REPLACE INTO TABLE t1 (pk,i,ts); LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/load.data' REPLACE INTO TABLE t1 (pk,i,ts);
ERROR 22003: Out of range value for column 'vi' at row 1 ERROR 22003: Out of range value for column 'vi' at row 1
DROP TABLE t1; DROP TABLE t1;
# MDEV-19011 Assertion `file->s->base.reclength < file->s->vreclength'
# failed in ha_myisam::setup_vcols_for_repair
CREATE TABLE t1 (a INT GENERATED ALWAYS AS (1) VIRTUAL) ENGINE=MyISAM;
ALTER TABLE t1 ADD KEY (a);
DROP TABLE t1;
DROP VIEW IF EXISTS v1,v2; DROP VIEW IF EXISTS v1,v2;
DROP TABLE IF EXISTS t1,t2,t3; DROP TABLE IF EXISTS t1,t2,t3;
DROP PROCEDURE IF EXISTS p1; DROP PROCEDURE IF EXISTS p1;

3
storage/myisam/ha_myisam.cc
View File

@ -945,7 +945,8 @@ void ha_myisam::setup_vcols_for_repair(HA_CHECK *param)
return; return;
file->s->vreclength= new_vreclength; file->s->vreclength= new_vreclength;
} }
DBUG_ASSERT(file->s->base.reclength < file->s->vreclength); DBUG_ASSERT(file->s->base.reclength < file->s->vreclength ||
!table->s->stored_fields);
param->fix_record= compute_vcols; param->fix_record= compute_vcols;
table->use_all_columns(); table->use_all_columns();
table->vcol_set= &table->s->all_set; table->vcol_set= &table->s->all_set;