Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0

		/* 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