Commit 66ae0ded authored by marko's avatar marko

branches/zip: Fix all bugs detected by mysql-test-run. The exactly same set

of tests are failing with trunk -r869, with this revision using uncompressed
storage, and with this revision hard-wired to use 1-kilobyte compressed pages
and innodb_file_per_table.

btr_push_update_extern_fields(): Do not call ut_ulint_sort() if n_pushed == 0.

btr_copy_externally_stored_field_prefix_low(): Replace ut_max() with ut_min().
parent a7540940
......@@ -3539,7 +3539,9 @@ btr_push_update_extern_fields(
}
}
ut_ulint_sort(ext_vect, ext_vect + n_pushed, 0, n_pushed);
if (n_pushed) {
ut_ulint_sort(ext_vect, ext_vect + n_pushed, 0, n_pushed);
}
return(n_pushed);
}
......@@ -4274,7 +4276,7 @@ btr_copy_externally_stored_field_prefix_low(
ulint part_len
= btr_blob_get_part_len(blob_header);
ulint copy_len
= ut_max(part_len, len - copied_len);
= ut_min(part_len, len - copied_len);
memcpy(buf + copied_len,
blob_header + BTR_BLOB_HDR_SIZE, copy_len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment