mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-12 18:10:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-39190 mariadb-dump --dump-slave outputs partial output for old servers

Browse source 
When dumping from older servers, the MDEV-37146 optimization was
clever to reuse the SHOW ALL SLAVES STATUS from an earlier step.
But it forgot to rewind the tape before playing again,
so it only saw a blank screen.
It also left an extra “SHOW ALL SLAVES STATUS” text in dead code.

This commit fixes both of these oversights.

Reviewed-by: Brandon Nesterenko <brandon.nesterenko@mariadb.com>
This commit is contained in:
ParadoxV5 2026-04-15 16:02:15 -06:00
commit 60f5bf76f5
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/mysqldump.cc
View file

@ -6529,11 +6529,9 @@ static int do_show_slave_status(MYSQL *mysql_con,
if (have_info_schema_slave_status)
{
if (mysql_query_with_error_report(
mysql_con, &slave, have_info_schema_slave_status ?
"SELECT Connection_name, Master_Host, Master_Port, Relay_Master_Log_File,"
" Exec_Master_Log_Pos FROM information_schema.SLAVE_STATUS" :
"SHOW ALL SLAVES STATUS"
if (mysql_query_with_error_report(mysql_con, &slave,
"SELECT Connection_name, Master_Host, Master_Port, Relay_Master_Log_File,"
" Exec_Master_Log_Pos FROM information_schema.SLAVE_STATUS"
))
{
if (!ignore_errors)
@ -6544,7 +6542,11 @@ static int do_show_slave_status(MYSQL *mysql_con,
}
}
else
{
// Reuse the SHOW ALL SLAVES STATUS results from do_stop_slave_sql()
mysql_data_seek(slave_status_res, 0);
slave= slave_status_res;
}
if (get_gtid_pos(gtid_pos, false))
{