Applying InnoDB snapshot

Detailed revision comments:

r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.

storage/innodb_plugin/ChangeLog

+2009-12-02	The InnoDB Team
+
+	* srv/srv0start.c: Display the zlib version number at startup.
+	InnoDB compressed tables use zlib, and the implementation depends
+	on the zlib function compressBound(), whose definition was slightly
+	changed in zlib version 1.2.3.1 in 2006.  MySQL bundles zlib 1.2.3
+	from 2005, but some installations use a more recent zlib.
+
 2009-11-30	The InnoDB Team
 
 	* dict/dict0crea.c, dict/dict0mem.c, dict/dict0load.c,

storage/innodb_plugin/include/univ.i

@@ -204,11 +204,11 @@ operations (very slow); also UNIV_DEBUG must be defined */
 						in sync0sync.c */
 #define UNIV_BTR_PRINT				/* enable functions for
 						printing B-trees */
+#endif
 #define UNIV_ZIP_DEBUG				/* extensive consistency checks
 						for compressed pages */
 #define UNIV_ZIP_COPY				/* call page_zip_copy_recs()
 						more often */
-#endif
 
 #define UNIV_BTR_DEBUG				/* check B-tree links */
 #define UNIV_LIGHT_MEM_DEBUG			/* light memory debugging */