Merging mysql-8.0 to mysql-trunk

Author: gurusami

mysql-test/suite/innodb/r/lob_update.result

@@ -0,0 +1,14 @@
+#
+# Bug #30288139 MARK_NOT_PARTIALLY_UPDATABLE ASSERTION FAILURE:
+# BUF0BUF.CC:4189:PAGE_SIZE.EQUALS
+#
+CREATE TABLE tb
+(id INT PRIMARY KEY,
+t1 LONGBLOB,
+t2 LONGBLOB,
+v1 CHAR(2) AS (SUBSTR(t1,2,2)) VIRTUAL,
+INDEX(id,v1)) ROW_FORMAT=COMPRESSED;
+INSERT INTO tb (id,t1,t2) VALUES (1,REPEAT("x",100000),REPEAT("y",100000));
+UPDATE tb SET t1=REPEAT("y",100000),t2=REPEAT("x",100000) WHERE id=1;
+UPDATE tb SET t1="a" WHERE id=1;
+DROP TABLE tb;

mysql-test/suite/innodb/t/lob_update.test

@@ -0,0 +1,16 @@
+--echo #
+--echo # Bug #30288139 MARK_NOT_PARTIALLY_UPDATABLE ASSERTION FAILURE:
+--echo # BUF0BUF.CC:4189:PAGE_SIZE.EQUALS
+--echo #
+
+CREATE TABLE tb
+(id INT PRIMARY KEY,
+ t1 LONGBLOB,
+ t2 LONGBLOB,
+ v1 CHAR(2) AS (SUBSTR(t1,2,2)) VIRTUAL,
+ INDEX(id,v1)) ROW_FORMAT=COMPRESSED;
+
+INSERT INTO tb (id,t1,t2) VALUES (1,REPEAT("x",100000),REPEAT("y",100000));
+UPDATE tb SET t1=REPEAT("y",100000),t2=REPEAT("x",100000) WHERE id=1;
+UPDATE tb SET t1="a" WHERE id=1;
+DROP TABLE tb;

storage/innobase/include/row0upd.h

@@ -474,6 +474,20 @@ inline std::ostream &operator<<(std::ostream &out, const Lob_diff &obj) {
 
 /* Update vector field */
 struct upd_field_t {
+  upd_field_t()
+      : field_no(0),
+        orig_len(0),
+        exp(nullptr),
+        old_v_val(nullptr),
+        mysql_field(nullptr),
+        ext_in_old(false),
+        lob_diffs(nullptr),
+        lob_first_page_no(FIL_NULL),
+        lob_version(0),
+        last_trx_id(0),
+        last_undo_no(0),
+        heap(nullptr) {}
+
   unsigned field_no : 16; /*!< field number in an index, usually
                           the clustered index, but in updating
                           a secondary index record in btr0cur.cc

storage/innobase/lob/lob0lob.cc

@@ -1100,13 +1100,11 @@ ulint btr_push_update_extern_fields(dtuple_t *tuple, const upd_t *update,
   n = upd_get_n_fields(update);
 
   for (; n--; uf++) {
-    if (dfield_is_ext(&uf->new_val)) {
-      dfield_t *field = dtuple_get_nth_field(tuple, uf->field_no);
+    dfield_t *field = dtuple_get_nth_field(tuple, uf->field_no);
+    uf->ext_in_old = dfield_is_ext(field);
 
-      if (dfield_is_ext(field)) {
-        uf->ext_in_old = true;
-      } else {
-        uf->ext_in_old = false;
+    if (dfield_is_ext(&uf->new_val)) {
+      if (!dfield_is_ext(field)) {
         dfield_set_ext(field);
         n_pushed++;
       }