1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-12372 mysqlbinlog --version output is the same on 10.x as on 5.5.x, and contains not only version

Browse Source 
don't print usage() for --version
This commit is contained in:
Sergei Golubchik 2017-11-03 12:33:01 +01:00
parent c97a7cdbd0
commit 56394a78e3
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysqlbinlog.cc
View File

@ -2483,10 +2483,11 @@ int main(int argc, char** argv)
if (!argc || opt_version) if (!argc || opt_version)
{ {
if (!argc)
usage();
if (!opt_version) if (!opt_version)
{
usage();
retval= ERROR_STOP; retval= ERROR_STOP;
}
goto err; goto err;
} }

1
mysql-test/r/mysqlbinlog.result
View File

@ -1250,3 +1250,4 @@ DELIMITER ;
ROLLBACK /* added by mysqlbinlog */; ROLLBACK /* added by mysqlbinlog */;
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/; /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
mysqlbinlog Ver VER for OS at ARCH

6
mysql-test/t/mysqlbinlog.test
View File

@ -603,3 +603,9 @@ eval SET GLOBAL SERVER_ID = $old_server_id;
--exec $MYSQL_BINLOG --hexdump std_data/mdev-4645-binlog_group_id.binlog --exec $MYSQL_BINLOG --hexdump std_data/mdev-4645-binlog_group_id.binlog
--exec $MYSQL_BINLOG --hexdump std_data/mdev-4645-binlog_group_id_checksum.binlog --exec $MYSQL_BINLOG --hexdump std_data/mdev-4645-binlog_group_id_checksum.binlog
--exec $MYSQL_BINLOG --hexdump std_data/mdev-4645-binlog_none.binlog --exec $MYSQL_BINLOG --hexdump std_data/mdev-4645-binlog_none.binlog
#
# MDEV-12372 mysqlbinlog --version output is the same on 10.x as on 5.5.x, and contains not only version
#
replace_regex /.*mysqlbinlog(\.exe)? Ver .* for .* at [-_a-zA-Z0-9]+/mysqlbinlog Ver VER for OS at ARCH/;
exec $MYSQL_BINLOG --version;