mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
MDEV-12182 post-merge
* fix plugin version * don't print :unavaliable for localhost
This commit is contained in:
@@ -144,8 +144,11 @@ uninstall plugin server_audit;
|
||||
--enable_ps2_protocol
|
||||
|
||||
let $MYSQLD_DATADIR= `SELECT @@datadir`;
|
||||
if ($MARIADB_UPGRADE_EXE) { # windows
|
||||
let $replace_port= /localhost:\d+/localhost/;
|
||||
}
|
||||
# replace the timestamp, hostname, and port number with constant values
|
||||
--replace_regex /[0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\,[^,]*\,/TIME,HOSTNAME,/ /\,[1-9][0-9]*\,/,1,/ /\,[1-9][0-9]*/,ID/ /,localhost:([0-9]+|unavailable)/,localhost:port/
|
||||
--replace_regex /\d* \d\d:\d\d:\d\d\,[^,]*\,/TIME,HOSTNAME,/ /\,[1-9]\d*\,/,1,/ /\,[1-9]\d*/,ID/ $replace_port
|
||||
cat_file $MYSQLD_DATADIR/server_audit.log;
|
||||
remove_file $MYSQLD_DATADIR/server_audit.log;
|
||||
|
||||
|
Reference in New Issue
Block a user