From 3f62ea2c4176dd9d708adb25be5fb870497bbdc8 Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Thu, 30 Mar 2017 10:33:49 +0300 Subject: [PATCH] Update MaxAdmin documentation and release notes This is mostly about MaxAdmin file load removal. Also added a note on NamedServerFilter and MaxAdmin editing mode changes. --- Documentation/Reference/MaxAdmin.md | 17 ++++++++--------- .../MaxScale-2.2.0-Release-Notes.md | 8 +++++++- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Documentation/Reference/MaxAdmin.md b/Documentation/Reference/MaxAdmin.md index d65ebe41f..d9a1e2bb4 100644 --- a/Documentation/Reference/MaxAdmin.md +++ b/Documentation/Reference/MaxAdmin.md @@ -212,7 +212,7 @@ some minimal details of the commands available. Command history is available on platforms that support the libedit library. This allows the use of the up and down arrow keys to recall previous commands that have been executed by MaxAdmin. The default edit mode for the history is to -emulate the vi commands, the behavior of libedit may however be customized using +emulate *emacs* commands, the behavior of libedit may however be customized using the .editrc file. To obtain the history of commands that have been executed use the inbuilt history command. @@ -270,18 +270,17 @@ execution of the MariaDB MaxScale command. -bash-4.1$ ``` -Command files may be executed by either calling MaxAdmin with the name of the -file that contains the commands +Command files may be executed by redirecting them to MaxAdmin. ``` -maxadmin listall.ms +maxadmin < listall.ms ``` -Or by using the #! mechanism to make the command file executable from the -shell. To do this add a line at the start of your command file that contains the -#! directive with the path of the MaxAdmin executable. Command options may also -be given in this line. For example to create a script file that runs a set of -list commands +Another option is to use the #! mechanism to make the command file executable +from the shell. To do this add a line at the start of your command file that +contains the #! directive with the path of the MaxAdmin executable. Command +options may also be given in this line. For example to create a script file that +runs a set of list commands ``` #!/usr/bin/maxadmin diff --git a/Documentation/Release-Notes/MaxScale-2.2.0-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.2.0-Release-Notes.md index f8e50bcfb..f1f2d8c2e 100644 --- a/Documentation/Release-Notes/MaxScale-2.2.0-Release-Notes.md +++ b/Documentation/Release-Notes/MaxScale-2.2.0-Release-Notes.md @@ -13,7 +13,8 @@ report at [Jira](https://jira.mariadb.org). ### NamedServerFilter This filter now uses the PCRE2-libarary to match queries. Previously, it used -the POSIX-version of PCRE2. +the POSIX-version of PCRE2. The filter also accepts multiple match-server pairs. +Please see the NamedServerFilter documentation for details. ## Dropped Features @@ -33,6 +34,11 @@ The following commands have been deprecated: The commands can be issued, but have no effect. +MaxAdmin no longer attempts to interpret additional command line parameters as a +file name to load commands from (e.g. `maxadmin mycommands.txt`). The shell +indirection operator `<` should be used to achieve the same effect (`maxadmin < +mycommands.txt`). + ## New Features ### MySQL Monitor Crash Safety