1*4882a593SmuzhiyunFix build without zlib 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunDon't include unconditionally zlib.h, and compile out code that 4*4882a593Smuzhiyunrequires zlib support. 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 7*4882a593Smuzhiyun 8*4882a593Smuzhiyundiff -durN mysql-5.1.73.orig/mysys/checksum.c mysql-5.1.73/mysys/checksum.c 9*4882a593Smuzhiyun--- mysql-5.1.73.orig/mysys/checksum.c 2020-07-14 17:34:38.212304432 +0200 10*4882a593Smuzhiyun+++ mysql-5.1.73/mysys/checksum.c 2020-07-14 18:06:45.076342493 +0200 11*4882a593Smuzhiyun@@ -16,7 +16,9 @@ 12*4882a593Smuzhiyun 13*4882a593Smuzhiyun #include <my_global.h> 14*4882a593Smuzhiyun #include <my_sys.h> 15*4882a593Smuzhiyun+#ifdef HAVE_COMPRESS 16*4882a593Smuzhiyun #include <zlib.h> 17*4882a593Smuzhiyun+#endif 18*4882a593Smuzhiyun 19*4882a593Smuzhiyun /* 20*4882a593Smuzhiyun Calculate a long checksum for a memoryblock. 21*4882a593Smuzhiyundiff -durN mysql-5.1.73.orig/sql/item_strfunc.cc mysql-5.1.73/sql/item_strfunc.cc 22*4882a593Smuzhiyun--- mysql-5.1.73.orig/sql/item_strfunc.cc 2020-07-14 17:34:38.160304431 +0200 23*4882a593Smuzhiyun+++ mysql-5.1.73/sql/item_strfunc.cc 2020-07-14 18:04:36.956339962 +0200 24*4882a593Smuzhiyun@@ -35,7 +35,9 @@ 25*4882a593Smuzhiyun #include "my_md5.h" 26*4882a593Smuzhiyun #include "sha1.h" 27*4882a593Smuzhiyun #include "my_aes.h" 28*4882a593Smuzhiyun+#ifdef HAVE_COMPRESS 29*4882a593Smuzhiyun #include <zlib.h> 30*4882a593Smuzhiyun+#endif 31*4882a593Smuzhiyun C_MODE_START 32*4882a593Smuzhiyun #include "../mysys/my_static.h" // For soundex_map 33*4882a593Smuzhiyun C_MODE_END 34*4882a593Smuzhiyundiff -durN mysql-5.1.73.orig/sql/sql_table.cc mysql-5.1.73/sql/sql_table.cc 35*4882a593Smuzhiyun--- mysql-5.1.73.orig/sql/sql_table.cc 2020-07-14 17:34:38.156304431 +0200 36*4882a593Smuzhiyun+++ mysql-5.1.73/sql/sql_table.cc 2020-07-14 18:14:48.628352044 +0200 37*4882a593Smuzhiyun@@ -1681,6 +1681,7 @@ 38*4882a593Smuzhiyun goto end; 39*4882a593Smuzhiyun } 40*4882a593Smuzhiyun } 41*4882a593Smuzhiyun+#ifdef HAVE_COMPRESS 42*4882a593Smuzhiyun if (flags & WFRM_PACK_FRM) 43*4882a593Smuzhiyun { 44*4882a593Smuzhiyun /* 45*4882a593Smuzhiyun@@ -1702,6 +1703,7 @@ 46*4882a593Smuzhiyun } 47*4882a593Smuzhiyun error= my_delete(shadow_frm_name, MYF(MY_WME)); 48*4882a593Smuzhiyun } 49*4882a593Smuzhiyun+#endif 50*4882a593Smuzhiyun if (flags & WFRM_INSTALL_SHADOW) 51*4882a593Smuzhiyun { 52*4882a593Smuzhiyun #ifdef WITH_PARTITION_STORAGE_ENGINE 53