Merge branch 'mysql-8.0' into mysql-8.4

dahlerlend · dahlerlend · commit 379141d8ccb8 · 2025-03-14T16:42:32.000+01:00
Change-Id: Iaeae3fc3b2c38fa61b4a233226a5b08ef4c27a88
diff --git a/storage/innobase/dict/dict0dd.cc b/storage/innobase/dict/dict0dd.cc
@@ -443,6 +443,7 @@ int dd_table_open_on_dd_obj(THD *thd, dd::cache::Dictionary_client *client,
   }
 
   const char *table_name = tbl_name;
+  char tmp_name[FN_REFLEN + 1];
   if (!tbl_name) {
     dd::Schema *schema;
     error = client->acquire_uncached<dd::Schema>(dd_table.schema_id(), &schema);
@@ -451,7 +452,6 @@ int dd_table_open_on_dd_obj(THD *thd, dd::cache::Dictionary_client *client,
     }
 
     bool truncated;
-    char tmp_name[FN_REFLEN + 1];
     build_table_filename(tmp_name, sizeof(tmp_name) - 1, schema->name().c_str(),
                          dd_table.name().c_str(), nullptr, 0, &truncated);
 

Original file line number	Diff line number	Diff line change
`@@ -443,6 +443,7 @@ int dd_table_open_on_dd_obj(THD thd, dd::cache::Dictionary_client client,`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`const char *table_name = tbl_name;`
	`446`	`+ char tmp_name[FN_REFLEN + 1];`
`446`	`447`	`if (!tbl_name) {`
`447`	`448`	`dd::Schema *schema;`
`448`	`449`	`error = client->acquire_uncached<dd::Schema>(dd_table.schema_id(), &schema);`
`@@ -451,7 +452,6 @@ int dd_table_open_on_dd_obj(THD thd, dd::cache::Dictionary_client client,`
`451`	`452`	`}`
`452`	`453`
`453`	`454`	`bool truncated;`
`454`		`- char tmp_name[FN_REFLEN + 1];`
`455`	`455`	`build_table_filename(tmp_name, sizeof(tmp_name) - 1, schema->name().c_str(),`
`456`	`456`	`dd_table.name().c_str(), nullptr, 0, &truncated);`
`457`	`457`