mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 17:33:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426)

Browse source
This commit is contained in:
marko 2009-06-17 12:03:45 +00:00
parent 1264059c16
commit 3b5d593438
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-06-17 The InnoDB Team
* row/row0merge.c:
Fix Bug#45426 UNIV_DEBUG build cause assertion error at CREATE INDEX
2009-06-17 The InnoDB Team
* mysql-test/innodb_bug45357.result, mysql-test/innodb_bug45357.test,

9
row/row0merge.c
View file

@ -849,7 +849,14 @@ err_exit:
avail_size = block[1] - b;
memcpy(*buf, b, avail_size);
*mrec = *buf + extra_size;
rec_offs_make_valid(*mrec, index, offsets);
#ifdef UNIV_DEBUG
/* We cannot invoke rec_offs_make_valid() here, because there
are no REC_N_NEW_EXTRA_BYTES between extra_size and data_size.
Similarly, rec_offs_validate() would fail, because it invokes
rec_get_status(). */
offsets[2] = (ulint) *mrec;
offsets[3] = (ulint) index;
#endif /* UNIV_DEBUG */
if (!row_merge_read(fd, ++(*foffs), block)) {