MDEV-27673 Warning after "select progress from information_schema.pro…

…cesslist" after moving fields in optimize_schema_tables_memory_usage() store default values into their new, moved, locations.
MariaDB · Apr 5, 2022 · 2d2c3da · 2d2c3da
1 parent cf8d30e
commit 2d2c3da
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/mysql-test/main/information_schema.result b/mysql-test/main/information_schema.result
@@ -2370,5 +2370,11 @@ DROP TABLE t1;
 DROP TABLE t1;
 SET SQL_MODE=DEFAULT;
 #
+# MDEV-27673 Warning after "select progress from information_schema.processlist"
+#
+select progress from information_schema.processlist limit 1;
+progress
+0.000
+#
 # End of 10.3 tests
 #
diff --git a/mysql-test/main/information_schema.test b/mysql-test/main/information_schema.test
@@ -2104,7 +2104,10 @@ DROP TABLE t1;
 DROP TABLE t1;
 SET SQL_MODE=DEFAULT;
 
-
+--echo #
+--echo # MDEV-27673 Warning after "select progress from information_schema.processlist"
+--echo #
+select progress from information_schema.processlist limit 1;
 
 --echo #
 --echo # End of 10.3 tests

diff --git a/sql/sql_show.cc b/sql/sql_show.cc
@@ -8803,6 +8803,7 @@ bool optimize_schema_tables_memory_usage(List<TABLE_LIST> &tables)
         if (bitmap_is_set(table->read_set, i))
         {
           field->move_field(cur);
+          field->reset();
           *to_recinfo++= *from_recinfo;
           cur+= from_recinfo->length;
         }
@@ -8823,6 +8824,7 @@ bool optimize_schema_tables_memory_usage(List<TABLE_LIST> &tables)
         table->s->reclength= to_recinfo->length= 1;
         to_recinfo++;
       }
+      store_record(table, s->default_values);
       p->recinfo= to_recinfo;
 
       // TODO switch from Aria to Memory if all blobs were optimized away?