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

Fix of MDEV-33856, becaouse we have more then 64 fields

Browse Source 
and unsigned long long can not be used as bitfield.
This commit is contained in:
Oleksandr Byelkin
2024-08-08 13:11:25 +02:00
parent 337307a943
commit a4effbf90f
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sql/sql_show.cc
View File

@@ -9112,27 +9112,16 @@ static int make_slave_status_old_format(THD *thd, ST_SCHEMA_TABLE *schema_table)
Name_resolution_context *context= &thd->lex->first_select_lex()->context; Name_resolution_context *context= &thd->lex->first_select_lex()->context;
DBUG_ASSERT(thd->lex->sql_command == SQLCOM_SHOW_SLAVE_STAT); DBUG_ASSERT(thd->lex->sql_command == SQLCOM_SHOW_SLAVE_STAT);
bool all_slaves= thd->lex->mi.show_all_slaves; bool all_slaves= thd->lex->mi.show_all_slaves;
ulonglong used_fields= ~0ULL;
if (!all_slaves)
{
/*
Remove 2 first fields (Connection_name and Slave_SQL_State) and all
fields above and including field 56 (Retried_transactions)
*/
used_fields&= ~((1ULL << SLAVE_STATUS_COL_CONNECTION_NAME) |
(1ULL << SLAVE_STATUS_COL_SLAVE_SQL_STATE));
used_fields&= ((1ULL << SLAVE_STATUS_COL_RETRIED_TRANSACTIONS) - 1);
}
for (uint i=0; !field_info->end_marker(); field_info++, i++) for (uint i=0; !field_info->end_marker(); field_info++, i++)
{ {
/* if (all_slaves ||
We have all_slaves here to take into account that we some day may have // not SLAVE_STATUS_COL_CONNECTION_NAME,
more than 64 fields in the list. If all_slaves is set we should show // SLAVE_STATUS_COL_SLAVE_SQL_STATE
all fields. // and less
*/ // SLAVE_STATUS_COL_RETRIED_TRANSACTIONS
if (all_slaves || (used_fields & ((1ULL << i)))) !(i <= SLAVE_STATUS_COL_SLAVE_SQL_STATE ||
i >= SLAVE_STATUS_COL_RETRIED_TRANSACTIONS))
{ {
LEX_CSTRING field_name= field_info->name(); LEX_CSTRING field_name= field_info->name();
Item_field *field= new (thd->mem_root) Item_field *field= new (thd->mem_root)