[packages/mysql/MYSQL_5_6] - broken in debug build, fix it

arekm arekm at pld-linux.org
Wed Oct 11 13:41:12 CEST 2017


commit af62a390b29a14f0878111b0b49bcdc2c2249bd2
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Oct 11 13:41:06 2017 +0200

    - broken in debug build, fix it

 mysql-build.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
---
diff --git a/mysql-build.patch b/mysql-build.patch
index 2d055f2..b1230f8 100644
--- a/mysql-build.patch
+++ b/mysql-build.patch
@@ -83,3 +83,23 @@
  	ut_ad(ut_is_2pow(zip_size));
  	ut_ad(comp || !zip_size);
  
+--- percona-server-5.6.37-82.2/sql/log_event.cc~	2017-08-24 13:30:44.000000000 +0200
++++ percona-server-5.6.37-82.2/sql/log_event.cc	2017-10-11 12:48:39.034505850 +0200
+@@ -7839,7 +7839,7 @@ User_var_log_event(const char* buf, uint
+ #ifndef DBUG_OFF
+     bool old_pre_checksum_fd= description_event->is_version_before_checksum();
+ #endif
+-    DBUG_ASSERT((bytes_read == data_written -
++    DBUG_ASSERT((bytes_read == (data_written -
+                  (old_pre_checksum_fd ||
+                   (description_event->checksum_alg ==
+                    BINLOG_CHECKSUM_ALG_OFF)) ?
+@@ -7849,7 +7849,7 @@ User_var_log_event(const char* buf, uint
+                  (old_pre_checksum_fd ||
+                   (description_event->checksum_alg ==
+                    BINLOG_CHECKSUM_ALG_OFF)) ?
+-                 0 : BINLOG_CHECKSUM_LEN));
++                 0 : BINLOG_CHECKSUM_LEN)));
+     if ((data_written - bytes_read) > 0)
+     {
+       flags= (uint) *(buf + UV_VAL_IS_NULL + UV_VAL_TYPE_SIZE +
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/af62a390b29a14f0878111b0b49bcdc2c2249bd2



More information about the pld-cvs-commit mailing list