mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
MDEV-33212: mysqldump uses MASTER_LOG_POS with dump-slave
The patch for MDEV-15530 incorrectly added a column in the middle of SHOW SLAVE STATUS output. This is wrong, as it breaks backwards compatibility with existing applications and scripts. In this case, it even broke mariadb-dump, which is included in the server source tree! Revert the incorrect change, putting the new Replicate_Rewrite_DB at the end of SHOW SLAVE STATUS output. Add a testcase for the mariadb-dump --dump-slave wrong output problem. Also add a testcase rpl.rpl_show_slave_status to hopefully prevent any future incorrect additions to SHOW SLAVE STATUS. Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
@@ -25,6 +25,7 @@
|
||||
# Supported formats:
|
||||
# - (default) : "FOUND n /pattern/ in FILE " or "NOT FOUND ..."
|
||||
# - "matches" : Each match is printed, on a separate line
|
||||
# - "count" : "FOUND n matches in FILE" or "NOT FOUND ..." (omit pattern)
|
||||
#
|
||||
# In case of
|
||||
# - SEARCH_FILE and/or SEARCH_PATTERN is not set
|
||||
@@ -113,6 +114,10 @@ perl;
|
||||
print $_ . "\n";
|
||||
}
|
||||
}
|
||||
elsif ($ENV{SEARCH_OUTPUT} eq "count")
|
||||
{
|
||||
print "$res matches in $ENV{SEARCH_FILE}\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
print "$res /$search_pattern/ in $ENV{SEARCH_FILE}\n";
|
||||
|
Reference in New Issue
Block a user