diff --git a/storage/innobase/row/row0row.cc b/storage/innobase/row/row0row.cc
|
index 400faba0d88..ffcb9581de3 100644
|
--- a/storage/innobase/row/row0row.cc
|
+++ b/storage/innobase/row/row0row.cc
|
@@ -377,6 +377,89 @@ row_build_index_entry_low(
|
return entry;
|
}
|
|
+/** Pad an instanly extended fixed-length column to the current size.
|
+@param[in,out] heap memory heap for allocations
|
+@param[in,out] d column data
|
+@param[in,out] len length of the data
|
+@param[in] c column metadata */
|
+ATTRIBUTE_COLD
|
+static void
|
+row_build_pad(mem_heap_t* heap, const void*& d, ulint& len, const dict_col_t&c)
|
+{
|
+ DBUG_ASSERT(len);
|
+ DBUG_ASSERT(c.len > len);
|
+ byte* b = static_cast<byte*>(mem_heap_alloc(heap, c.len));
|
+
|
+ /* This is similar to row_sel_field_store_in_mysql_format(). */
|
+ switch (c.mtype) {
|
+ default: DBUG_ASSERT(!"unhandled type"); break;
|
+ case DATA_FIXBINARY:
|
+ memcpy(b, d, len);
|
+ memset(b + len, 0, c.len - len);
|
+ break;
|
+ case DATA_INT:
|
+ if (c.prtype & DATA_UNSIGNED) {
|
+ memset(b, 0, c.len - len);
|
+ memcpy(&b[c.len - len], d, len);
|
+ } else if (*static_cast<const byte*>(d) & 0x80) {
|
+ /* non-negative signed (the sign bit is inverted) */
|
+ *b = 0x80;
|
+ memset(b + 1, 0, c.len - len - 1);
|
+ memcpy(&b[c.len - len], d, len);
|
+ b[c.len - len] &= 0x7f;
|
+ } else {
|
+ /* negative (the sign bit is inverted) */
|
+ *b = 0x7f;
|
+ memset(b + 1, 0xff, c.len - len - 1);
|
+ memcpy(&b[c.len - len], d, len);
|
+ b[c.len - len] |= 0x80;
|
+ }
|
+ break;
|
+ case DATA_CHAR:
|
+ memcpy(b, d, len);
|
+ byte* pad = b + len;
|
+ const byte* const end = b + c.len;
|
+ switch (c.mbminlen) {
|
+ default:
|
+ ut_error;
|
+ case 1:
|
+ memset(pad, 0x20, c.len - len);
|
+ break;
|
+ case 2:
|
+ /* A space char is two bytes,
|
+ 0x0020 in UCS2 and UTF-16 */
|
+
|
+ if (UNIV_UNLIKELY(len & 1)) {
|
+ /* A 0x20 has been stripped from the column.
|
+ Pad it back. */
|
+ if (pad < end) {
|
+ *pad++ = 0x20;
|
+ }
|
+ }
|
+ while (pad < end) {
|
+ *pad++ = 0x00;
|
+ *pad++ = 0x20;
|
+ }
|
+ break;
|
+ case 4:
|
+ /* InnoDB should never have stripped partial
|
+ UTF-32 characters. */
|
+ DBUG_ASSERT(!(len & 3));
|
+ DBUG_ASSERT(!(c.len & 3));
|
+ while (pad < end) {
|
+ *pad++ = 0x00;
|
+ *pad++ = 0x00;
|
+ *pad++ = 0x00;
|
+ *pad++ = 0x20;
|
+ }
|
+ break;
|
+ }
|
+ }
|
+
|
+ d = b;
|
+ len = c.len;
|
+}
|
+
|
/** An inverse function to row_build_index_entry. Builds a row from a
|
record in a clustered index, with possible indexing on ongoing
|
addition of new virtual columns.
|
@@ -561,7 +644,25 @@ row_build_low(
|
if (field && type != ROW_COPY_POINTERS) {
|
field = mem_heap_dup(heap, field, len);
|
}
|
+ } else if (len == UNIV_SQL_NULL) {
|
+ DBUG_ASSERT(index->fields[i].col->is_nullable());
|
+ } else if (index->fields[i].fixed_len) {
|
+ DBUG_ASSERT(len == index->fields[i].fixed_len);
|
+ } else if (UNIV_LIKELY(index->table->not_redundant())) {
|
+ } else {
|
+ dict_col_t& col = *index->fields[i].col;
|
+ switch (col.mtype) {
|
+ case DATA_CHAR: case DATA_FIXBINARY: case DATA_INT:
|
+ if (len == col.len) {
|
+ break;
|
+ }
|
+ /* dtype_get_fixed_size_low() set
|
+ fixed_len=0 for these fixed-length.
|
+ Pad to the current size. */
|
+ row_build_pad(heap, field, len, col);
|
+ }
|
}
|
+ DBUG_ASSERT(len >= index->fields[i].fixed_len);
|
dfield_set_data(dfield, field, len);
|
|
if (rec_offs_nth_extern(offsets, i)) {
|