diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2015-02-04 10:50:16 +0200 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2015-02-04 10:50:16 +0200 |
| commit | f32091532da365db85d5441ddff212995e15aa9e (patch) | |
| tree | c5f7b40c6f46ae59ba97ca000badec2c496a41b1 /storage/xtradb/rem | |
| parent | 7afbf338aaf425d41c2e27044b32ea94aecceb42 (diff) | |
| download | mariadb-git-f32091532da365db85d5441ddff212995e15aa9e.tar.gz | |
MDEV-7055: MySQL#74664 - InnoDB: Failing assertion: len <= col->len || col->mtype == 5 || (col->len == 0 && col->mtype == 1) in file rem0rec.cc line 845
Debug assertion maybe too strict.
Diffstat (limited to 'storage/xtradb/rem')
| -rw-r--r-- | storage/xtradb/rem/rem0rec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/xtradb/rem/rem0rec.c b/storage/xtradb/rem/rem0rec.c index d938aa696dd..95f249bc70e 100644 --- a/storage/xtradb/rem/rem0rec.c +++ b/storage/xtradb/rem/rem0rec.c @@ -830,7 +830,8 @@ rec_get_converted_size_comp_prefix_low( } ut_ad(len <= col->len || col->mtype == DATA_BLOB - || (col->len == 0 && col->mtype == DATA_VARCHAR)); + || col->mtype == DATA_VARMYSQL + || (col->len == 0 && col->mtype == DATA_VARCHAR)); fixed_len = field->fixed_len; if (temp && fixed_len @@ -1257,7 +1258,8 @@ rec_convert_dtuple_to_rec_comp( *lens-- = (byte) len; } else { ut_ad(len <= dtype_get_len(type) - || dtype_get_mtype(type) == DATA_BLOB); + || dtype_get_mtype(type) == DATA_BLOB + || dtype_get_mtype(type) == DATA_VARMYSQL); if (len < 128 || (dtype_get_len(type) < 256 && dtype_get_mtype(type) != DATA_BLOB)) { |