diff --git a/doc/source/howtos/garbd_howto.rst b/doc/source/howtos/garbd_howto.rst index b43ac6a40414..b9d9e959d1db 100644 --- a/doc/source/howtos/garbd_howto.rst +++ b/doc/source/howtos/garbd_howto.rst @@ -54,7 +54,8 @@ When starting from the shell, you can set the parameters from the command line o --option="socket.ssl_key=/etc/ssl/mysql/server-key.pem; \ socket.ssl_cert=/etc/ssl/mysql/server-cert.pem; \ socket.ssl_ca=/etc/ssl/mysql/ca.pem; \ - socket.ssl_cipher=AES128-SHA256" + socket.ssl_cipher=AES128-SHA256; \ + socket.ssl=yes" To avoid entering the options each time you start ``garbd``, edit the options in the configuration file. To configure *Galera Arbitrator* on *Ubuntu/Debian*, edit the :file:`/etc/default/garb` file. On RedHat or derivative distributions, the configuration can be found in :file:`/etc/sysconfig/garb` file. diff --git a/doc/source/manual/certification.rst b/doc/source/manual/certification.rst index 1983a97da4f7..890d37f69691 100644 --- a/doc/source/manual/certification.rst +++ b/doc/source/manual/certification.rst @@ -126,13 +126,13 @@ The following happens if two nodes get ready with their packet at same time: * Node 1: ``update i = i + 10;`` * Node 2: ``update i = i + 100;`` - Let's associate transaction ID (``trx-id``) for an update transaction + Let's associate transaction ID (``trx_id``) for an update transaction that is executed on Node 1 and Node 2 in parallel. Although the real algorithm is more involved (with ``uuid`` + ``seqno``), it is conceptually the same, so we are using ``trx_id``. - * Node 1: ``update action: trx-id=n1x`` - * Node 2: ``update action: trx-id=n2x`` + * Node 1: ``update action: trx_id=n1x`` + * Node 2: ``update action: trx_id=n2x`` Both node packets are added to the channel, but the transactions are conflicting.