Skip to content
Permalink
Browse files

MDEV-8020: innodb.innodb-mdev-7055 produces valgrind warnings in buil…

…dbot

Fixed by reverting incorrect fix of MDEC-7055 (reopened) and removing the
test case (because it now crashes).
  • Loading branch information...
janlindstrom committed Apr 28, 2015
1 parent ac2b92c commit 4c174fcb4aa0ad7173e0e19fb9c7f26e95903187

This file was deleted.

This file was deleted.

@@ -830,8 +830,7 @@ rec_get_converted_size_comp_prefix_low(
}

ut_ad(len <= col->len || col->mtype == DATA_BLOB
|| col->mtype == DATA_VARMYSQL
|| (col->len == 0 && col->mtype == DATA_VARCHAR));
|| (col->len == 0 && col->mtype == DATA_VARCHAR));

fixed_len = field->fixed_len;
if (temp && fixed_len
@@ -1258,8 +1257,7 @@ 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_VARMYSQL);
|| dtype_get_mtype(type) == DATA_BLOB);
if (len < 128
|| (dtype_get_len(type) < 256
&& dtype_get_mtype(type) != DATA_BLOB)) {
@@ -830,7 +830,6 @@ rec_get_converted_size_comp_prefix_low(
}

ut_ad(len <= col->len || col->mtype == DATA_BLOB
|| col->mtype == DATA_VARMYSQL
|| (col->len == 0 && col->mtype == DATA_VARCHAR));

fixed_len = field->fixed_len;
@@ -1258,8 +1257,7 @@ 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_VARMYSQL);
|| dtype_get_mtype(type) == DATA_BLOB);
if (len < 128
|| (dtype_get_len(type) < 256
&& dtype_get_mtype(type) != DATA_BLOB)) {

0 comments on commit 4c174fc

Please sign in to comment.
You can’t perform that action at this time.