Patch backported to cluster-7.6:

Bug#35450016 'ndb_log_update_minimal=ON' is not able to replicate primary key updates

The minimal binlog format excluded all primary key columns from the
'after values' reflecting the updated row. The rational for this
was a flawed assumption about the primary key being 'constant'
when an UPDATE trigger is received.

However, if the primary key contain character data type, an UPDATE
trigger will also be received if character columns are updated to
values being 'equal' by comparison rules of the collation set being
used. E.g' 'xyz' -> XYZ'.

In order to being able to replicate such changes, we need to include
them in the after values as well.

This patch midified Ndb_event_data::init_pk_bitmap() to set up
a 'MY_BITMAP pk_nonchar_bitmap' in addition to the existing pk_bitmap.
The 'nonchar_bitmap' contain only the PK columns not being of a character
data type -> Will be 'constant' in an update trigger.

Ndb_event_data::generate_minimal_bitmap() is modified to exclude
only the nonchar_bitmap from the after values.

Note, that ideally we could (in addition) have compared the before and
after PK-values in DbtupTrigger, and included only those which changed
to a (binary) different value. This was attempted in another version
of a patch, but didn't succeed to make this work as intended.

It would also have introduced upgrade issues which would had
to be solved.

Change-Id: I90281cc6ffec1f3495f2336593547ceb7972d907
(cherry picked from commit be4fff857b8ddabf1b0eecb1e06d914829ae2148)

Author: Ole John Aske

mysql-test/suite/ndb_rpl/r/ndb_rpl_cmp_varchar_charset.result

@@ -516,9 +516,6 @@ select str from t1;
 str
 XYZ
 drop table t1;
-############################################################
-The two test cases below currently *fails* to replicate the
-changes due to Bug#35450016. The incorrect result is recorded.
 set global ndb_log_updated_only=0;
 set global ndb_log_update_as_write=0;
 set global ndb_log_update_minimal=1;
@@ -539,7 +536,7 @@ update t1 set str="one";
 Verify the replica update, no trailing spaces anymore!
 select concat("<<<",str,">>>") from t1;
 concat("<<<",str,">>>")
-<<<one        >>>
+<<<one>>>
 drop table t1;
 #########################################
 ############## Longvarchar ##############
@@ -550,7 +547,7 @@ update t1 set str="one";
 Verify the replica update, no trailing spaces anymore!
 select concat("<<<",str,">>>") from t1;
 concat("<<<",str,">>>")
-<<<one        >>>
+<<<one>>>
 drop table t1;
 #####################################
 ############ Varbinary ##############
@@ -580,7 +577,7 @@ update t1 set str="XYZ";
 Verify the replica updated varchar(32) to 'XYZ' as well
 select str from t1;
 str
-xyz
+XYZ
 drop table t1;
 ##################################
 ############## Char ##############
@@ -591,7 +588,7 @@ update t1 set str="XYZ";
 Verify the replica updated char(32) to 'XYZ' as well
 select str from t1;
 str
-xyz
+XYZ
 drop table t1;
 ##################################
 ############ Varbinary ###########
@@ -624,7 +621,7 @@ update t1 set str="one";
 Verify the replica update, no trailing spaces anymore!
 select concat("<<<",str,">>>") from t1;
 concat("<<<",str,">>>")
-<<<one        >>>
+<<<one>>>
 drop table t1;
 #########################################
 ############## Longvarchar ##############
@@ -635,7 +632,7 @@ update t1 set str="one";
 Verify the replica update, no trailing spaces anymore!
 select concat("<<<",str,">>>") from t1;
 concat("<<<",str,">>>")
-<<<one        >>>
+<<<one>>>
 drop table t1;
 #####################################
 ############ Varbinary ##############
@@ -665,7 +662,7 @@ update t1 set str="XYZ";
 Verify the replica updated varchar(32) to 'XYZ' as well
 select str from t1;
 str
-xyz
+XYZ
 drop table t1;
 ##################################
 ############## Char ##############
@@ -676,7 +673,7 @@ update t1 set str="XYZ";
 Verify the replica updated char(32) to 'XYZ' as well
 select str from t1;
 str
-xyz
+XYZ
 drop table t1;
 ##################################
 ############ Varbinary ###########

mysql-test/suite/ndb_rpl/t/ndb_rpl_cmp_varchar_charset.test

@@ -44,9 +44,6 @@ set global ndb_log_update_as_write=1;
 set global ndb_log_update_minimal=1;
 --source ndb_rpl_cmp_varchar_charset.inc
 
---echo ############################################################
---echo The two test cases below currently *fails* to replicate the
---echo changes due to Bug#35450016. The incorrect result is recorded.
 set global ndb_log_updated_only=0;
 set global ndb_log_update_as_write=0;
 set global ndb_log_update_minimal=1;

sql/ndb_event_data.cc

@@ -30,7 +30,8 @@
 Ndb_event_data::Ndb_event_data(NDB_SHARE *the_share) :
   shadow_table(NULL),
   share(the_share),
-  pk_bitmap(NULL)
+  pk_bitmap(NULL),
+  pk_nonchar_bitmap(NULL)
 {
   ndb_value[0]= NULL;
   ndb_value[1]= NULL;
@@ -45,6 +46,8 @@ Ndb_event_data::~Ndb_event_data()
 
   delete pk_bitmap;
   pk_bitmap = NULL;
+  delete pk_nonchar_bitmap;
+  pk_nonchar_bitmap = NULL;
 
   free_root(&mem_root, MYF(0));
   share= NULL;
@@ -121,12 +124,21 @@ void Ndb_event_data::init_pk_bitmap()
   }
   pk_bitmap = new MY_BITMAP();
   ndb_bitmap_init(*pk_bitmap, pk_bitbuf, shadow_table->s->fields);
+  pk_nonchar_bitmap = new MY_BITMAP();
+  ndb_bitmap_init(*pk_nonchar_bitmap, pk_nonchar_bitbuf,
+                  shadow_table->s->fields);
   KEY* key = shadow_table->key_info + shadow_table->s->primary_key;
   KEY_PART_INFO* key_part_info = key->key_part;
   const uint key_parts = key->user_defined_key_parts;
   for (uint i = 0; i < key_parts; i++, key_part_info++)
   {
     bitmap_set_bit(pk_bitmap, key_part_info->fieldnr - 1);
+    const bool is_char = key_part_info->type == HA_KEYTYPE_TEXT ||
+                         key_part_info->type == HA_KEYTYPE_VARTEXT1 ||
+                         key_part_info->type == HA_KEYTYPE_VARTEXT2;
+    if (!is_char) {
+      bitmap_set_bit(pk_nonchar_bitmap, key_part_info->fieldnr - 1);
+    }
   }
   assert(!bitmap_is_clear_all(pk_bitmap));
 }
@@ -150,8 +162,8 @@ void Ndb_event_data::generate_minimal_bitmap(MY_BITMAP *before, MY_BITMAP *after
     assert(!bitmap_is_clear_all(pk_bitmap));
     // set Before Image to contain only primary keys
     bitmap_copy(before, pk_bitmap);
-    // remove primary keys from After Image
-    bitmap_subtract(after, pk_bitmap);
+    // remove non-character primary keys from After Image
+    bitmap_subtract(after, pk_nonchar_bitmap);
   }
   else
   {

sql/ndb_event_data.h

@@ -45,12 +45,21 @@ class Ndb_event_data
   struct TABLE *shadow_table;
   struct NDB_SHARE *share;
   union NdbValue *ndb_value[2];
-  /* Bitmap with bit set for all primary key columns. */
+
+  // Bitmap with all primary key columns, used for "minimal bitmap"
   MY_BITMAP *pk_bitmap;
   my_bitmap_map pk_bitbuf[(NDB_MAX_ATTRIBUTES_IN_TABLE +
                             8*sizeof(my_bitmap_map) - 1) /
                            (8*sizeof(my_bitmap_map))];
 
+  // Bitmap with all primary key columns not being a character data type.
+  // Note that char PK columns may compare-as-equal even if not being binary
+  // identical. Thus they can not be eliminated from a "minimal bitmap".
+  MY_BITMAP *pk_nonchar_bitmap;
+  my_bitmap_map pk_nonchar_bitbuf[(NDB_MAX_ATTRIBUTES_IN_TABLE +
+                                    8*sizeof(my_bitmap_map) - 1) /
+                                   (8*sizeof(my_bitmap_map))];
+
   void print(const char* where, FILE* file) const;
   void init_pk_bitmap();
   void generate_minimal_bitmap(MY_BITMAP *before, MY_BITMAP *after);