Merge branch '2.3' into 2.4

This commit is contained in:
Markus Mäkelä 2019-12-03 10:05:34 +02:00
commit 9dceff7d9d
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
3 changed files with 86 additions and 25 deletions

View File

@ -8,9 +8,56 @@ tmpdir=$(mktemp -d)
cd $tmpdir
command -v apt-get
distro_id=`cat /etc/*-release | grep "^ID_LIKE=" | sed "s/ID=//"`
if [ $? == 0 ]
unset packager_type
if [[ ${distro_id} =~ "suse" ]]
then
packager_type="zypper"
fi
if [[ ${distro_id} =~ "rhel" ]]
then
packager_type="yum"
fi
if [[ ${distro_id} =~ "debian" ]]
then
packager_type="apt"
fi
if [[ ${packager_type} == "" ]]
then
command -v apt-get
if [ $? == 0 ]
then
packager_type="apt"
fi
command -v yum
if [ $? == 0 ]
then
packager_type="yum"
fi
command -v zypper
if [ $? == 0 ]
then
packager_type="zypper"
fi
fi
if [[ ${packager_type} == "" ]]
then
echo "Can not determine package manager type, exiting"
exit 1
fi
if [[ ${packager_type} == "apt" ]]
then
# DEB-based distro
install_libdir=/usr/lib
@ -48,29 +95,11 @@ then
sudo apt-get install -y --force-yes libgcrypt11-dev
fi
fi
else
## RPM-based distro
install_libdir=/usr/lib64
command -v yum
fi
if [ $? != 0 ]
then
# We need zypper here
sudo zypper -n refresh
sudo zypper -n update
sudo zypper -n install gcc gcc-c++ ncurses-devel bison glibc-devel libgcc_s1 perl \
make libtool libopenssl-devel libaio libaio-devel flex \
pcre-devel git wget tcl tcl-devel libuuid-devel \
xz-devel sqlite3 sqlite3-devel pkg-config lua lua-devel \
gnutls-devel libgcrypt-devel pam-devel systemd-devel libcurl-devel
sudo zypper -n install rpm-build
cat /etc/*-release | grep "SUSE Linux Enterprise Server 11"
if [ $? != 0 ]
then
sudo zypper -n install libedit-devel
fi
else
if [[ ${packager_type} == "yum" ]]
then
install_libdir=/usr/lib64
# YUM!
sudo yum clean all
sudo yum update -y
@ -110,7 +139,26 @@ else
sudo sed -i 's/--selinux-enabled/--selinux-enabled=false/' /etc/sysconfig/docker
sudo systemctl start docker
fi
fi
fi
if [[ ${packager_type} == "zypper" ]]
then
install_libdir=/usr/lib64
# We need zypper here
sudo zypper -n refresh
sudo zypper -n update
sudo zypper -n install gcc gcc-c++ ncurses-devel bison glibc-devel libgcc_s1 perl \
make libtool libopenssl-devel libaio libaio-devel flex \
pcre-devel git wget tcl tcl-devel libuuid-devel \
xz-devel sqlite3 sqlite3-devel pkg-config lua lua-devel \
gnutls-devel libgcrypt-devel pam-devel systemd-devel
sudo zypper -n install rpm-build
cat /etc/*-release | grep "SUSE Linux Enterprise Server 11"
if [ $? != 0 ]
then
sudo zypper -n install libedit-devel
fi
fi
# cmake

View File

@ -574,6 +574,14 @@ modifications done by the client itself.
addition to this, the `session_track_system_variables` parameter must be set
to `last_gtid`.
**Note:** This feature does not work with Galera or any other non-standard
replication mechanisms. As Galera does not update the `gtid_slave_pos`
variable when events are replicated via the Galera library, the
[`MASTER_GTID_WAIT`](https://mariadb.com/kb/en/library/master_gtid_wait/)
function used by MaxScale to synchronize reads will wait until the
timeout. With Galera this is not a serious issue as it, by nature, is a
mostly-synchronous replication mechanism.
A practical example can be given by the following set of SQL commands executed
with `autocommit=1`.

View File

@ -34,6 +34,11 @@ const server_fields = [
path: 'attributes.state',
description: 'Server state'
},
{
name: 'Version',
path: 'attributes.version_string',
description: 'Server version'
},
{
name: 'Last Event',
path: 'attributes.last_event',