Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
This commit is contained in:
commit
679f4fe66b
@ -279,7 +279,15 @@ rec_get_next_offs(
|
||||
/* Note that for 64 KiB pages, field_value can 'wrap around'
|
||||
and the debug assertion is not valid */
|
||||
|
||||
ut_ad((int16_t)field_value
|
||||
/* In the following assertion, field_value is interpreted
|
||||
as signed 16-bit integer in 2's complement arithmetics.
|
||||
If all platforms defined int16_t in the standard headers,
|
||||
the expression could be written simpler as
|
||||
(int16_t) field_value + ut_align_offset(...) < UNIV_PAGE_SIZE
|
||||
*/
|
||||
ut_ad((field_value >= 32768
|
||||
? field_value - 65536
|
||||
: field_value)
|
||||
+ ut_align_offset(rec, UNIV_PAGE_SIZE)
|
||||
< UNIV_PAGE_SIZE);
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user