Bug#32738972: Test innodb.upgrade_fts_aux fails on trunk

roylyseng · dahlerlend · commit 694e3e5044fd · 2021-06-21T15:48:11.000+02:00
When attempting to report the name of a table causing an error during
upgrade in function fix_generated_columns_for_upgrade(), a bad pointer
is supplied in the call to LogErr(). Fixed by using the correct pointer.

Notice that the test problem is not fixed by this.

Reviewed by: Dmitry Lenev &lt;Dmitry.Lenev@oracle.com&gt;

Change-Id: I06c053875fb73d7efb3675f6cc83a36feb177b71
diff --git a/sql/dd/upgrade_57/table.cc b/sql/dd/upgrade_57/table.cc
@@ -1264,7 +1264,7 @@ static bool fix_generated_columns_for_upgrade(
           error = true;
           LogErr(ERROR_LEVEL,
                  ER_CANT_PROCESS_EXPRESSION_FOR_GENERATED_COLUMN_TO_DD,
-                 to_string((*field_ptr)->gcol_info->expr_str).c_str(),
+                 to_string(sql_field->gcol_info->expr_str).c_str(),
                  table->s->db.str, table->s->table_name.str,
                  (*field_ptr)->field_name);
           break;
