Merge branch '2.2' into jynus-2.2

This commit is contained in:
Carlos Salguero
2016-07-12 13:49:15 -03:00
7 changed files with 112 additions and 0 deletions
+16
View File
@@ -7771,6 +7771,22 @@ stop archiving and exit. The default is /tmp/pt-archiver-sentinel. You
might find this handy to stop cron jobs gracefully if necessary. See also
L<"--stop">.
=item --slave-user
type: string
Sets the user to be used to connect to the slaves.
This parameter allows you to have a different user with less privileges on the
slaves but that user must exist on all slaves.
=item --slave-password
type: string
Sets the password to be used to connect to the slaves.
It can be used with --slave-user and the password for the user must be the same
on all slaves.
=item --set-vars
type: Array
+16
View File
@@ -6882,6 +6882,22 @@ type: string; default: /tmp/pt-heartbeat-sentinel
Exit if this file exists.
=item --slave-user
type: string
Sets the user to be used to connect to the slaves.
This parameter allows you to have a different user with less privileges on the
slaves but that user must exist on all slaves.
=item --slave-password
type: string
Sets the password to be used to connect to the slaves.
It can be used with --slave-user and the password for the user must be the same
on all slaves.
=item --set-vars
type: Array
+16
View File
@@ -7718,6 +7718,22 @@ The presence of the file specified by L<"--sentinel"> will cause all
running instances of pt-kill to exit. You might find this handy to stop cron
jobs gracefully if necessary. See also L<"--stop">.
=item --slave-user
type: string
Sets the user to be used to connect to the slaves.
This parameter allows you to have a different user with less privileges on the
slaves but that user must exist on all slaves.
=item --slave-password
type: string
Sets the password to be used to connect to the slaves.
It can be used with --slave-user and the password for the user must be the same
on all slaves.
=item --set-vars
type: Array
+16
View File
@@ -16105,6 +16105,22 @@ queries. A complete example:
pt-query-digest --sample 2 --no-report --output slowlog slow.log
=item --slave-user
type: string
Sets the user to be used to connect to the slaves.
This parameter allows you to have a different user with less privileges on the
slaves but that user must exist on all slaves.
=item --slave-password
type: string
Sets the password to be used to connect to the slaves.
It can be used with --slave-user and the password for the user must be the same
on all slaves.
=item --set-vars
type: Array
+16
View File
@@ -4213,6 +4213,22 @@ Example:
Might delay runtime a few seconds.
=item --slave-user
type: string
Sets the user to be used to connect to the slaves.
This parameter allows you to have a different user with less privileges on the
slaves but that user must exist on all slaves.
=item --slave-password
type: string
Sets the password to be used to connect to the slaves.
It can be used with --slave-user and the password for the user must be the same
on all slaves.
=item --set-vars
type: Array
+16
View File
@@ -5684,6 +5684,22 @@ type: string; default: /tmp/pt-slave-restart-sentinel
Exit if this file exists.
=item --slave-user
type: string
Sets the user to be used to connect to the slaves.
This parameter allows you to have a different user with less privileges on the
slaves but that user must exist on all slaves.
=item --slave-password
type: string
Sets the password to be used to connect to the slaves.
It can be used with --slave-user and the password for the user must be the same
on all slaves.
=item --set-vars
type: Array
+16
View File
@@ -12624,6 +12624,22 @@ type: string; default: #
The separator character used for CONCAT_WS(). This character is used to join
the values of columns when checksumming.
=item --slave-user
type: string
Sets the user to be used to connect to the slaves.
This parameter allows you to have a different user with less privileges on the
slaves but that user must exist on all slaves.
=item --slave-password
type: string
Sets the password to be used to connect to the slaves.
It can be used with --slave-user and the password for the user must be the same
on all slaves.
=item --set-vars
type: Array; group: Connection