database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-34388 fixup: Stack usage in rename_table_in_stat_tables()

Browse Source 
rename_table_in_stat_tables(): Allocate TABLE_LIST[STATISTICS_TABLES]
from the heap instead of the stack, to pass -Wframe-larger-than=16384
in an optimized CMAKE_BUILD_TYPE=RelWithDebInfo build.
This commit is contained in:
Marko Mäkelä
2025-05-23 14:51:38 +03:00
parent 69af638a0c
commit 96b7671b05
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_statistics.cc
View File

@@ -4023,16 +4023,24 @@ int rename_table_in_stat_tables(THD *thd, const LEX_CSTRING *db,
int err; int err;
enum_binlog_format save_binlog_format; enum_binlog_format save_binlog_format;
TABLE *stat_table; TABLE *stat_table;
TABLE_LIST tables[STATISTICS_TABLES];
int rc= 0; int rc= 0;
DBUG_ENTER("rename_table_in_stat_tables"); DBUG_ENTER("rename_table_in_stat_tables");
TABLE_LIST *tables=
static_cast<TABLE_LIST*>(my_malloc(PSI_NOT_INSTRUMENTED,
STATISTICS_TABLES * sizeof *tables,
MYF(MY_WME)));
if (!tables)
DBUG_RETURN(1);
start_new_trans new_trans(thd); start_new_trans new_trans(thd);
if (open_stat_tables(thd, tables, TRUE)) if (open_stat_tables(thd, tables, TRUE))
{ {
func_exit:
my_free(tables);
new_trans.restore_old_transaction(); new_trans.restore_old_transaction();
DBUG_RETURN(0); DBUG_RETURN(rc);
} }
save_binlog_format= thd->set_current_stmt_binlog_format_stmt(); save_binlog_format= thd->set_current_stmt_binlog_format_stmt();
@@ -4093,9 +4101,7 @@ int rename_table_in_stat_tables(THD *thd, const LEX_CSTRING *db,
thd->restore_stmt_binlog_format(save_binlog_format); thd->restore_stmt_binlog_format(save_binlog_format);
if (thd->commit_whole_transaction_and_close_tables()) if (thd->commit_whole_transaction_and_close_tables())
rc= 1; rc= 1;
goto func_exit;
new_trans.restore_old_transaction();
DBUG_RETURN(rc);
} }