Merge branch 'master'(3.1) into develop(3.2)

mariadb-corporation · Nov 6, 2022 · 42b581e · 42b581e
2 parents c9887da + 1088d97
commit 42b581e
Show file tree

Hide file tree

Showing 85 changed files with 6,792 additions and 3,328 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,18 +4,9 @@ services: docker
 addons:
   hosts:
     - mariadb.example.com
-#  homebrew:
-#    packages:
-#      - openssl
-#      - libiodbc
-#      - mariadb
 
 before_install:
-  #- chmod +x .travis/script.sh
-  #- chmod +x .travis/osx.sh
-  #- chmod +x .travis/gen-ssl.sh
-  #- chmod +x .travis/build/build.sh
-  #- chmod +x .travis/build/docker-entrypoint.sh
+  - chmod +x .travis/s390x.sh
   - chmod 777 .travis/build/
   - export PROJ_PATH=`pwd`
   - export ENTRYPOINT=$PROJ_PATH/.travis/sql
@@ -26,57 +17,55 @@ before_install:
 matrix:
   allow_failures:
     - os: linux
-      env: DB=mariadb:10.2 PACKET=8M MAXSCALE_VERSION=2.1.8
+      env: DB=mariadb:10.8 PACKET=8M MAXSCALE_VERSION=2.5.3
     - os: linux
       env: DB=build
-    - os: linux
-      env: DB=mysql:5.5
-    - os: linux
-      env: DB=mysql:5.6
     - os: linux
       env: DB=mysql:5.7
     - os: osx
-      env: DB=mariadb:10.5
+      env: DB=mariadb:10.8
+    - env: SKYSQL=true
+    - env: SKYSQL_HA=true MAXSCALE_TEST_DISABLE=true
     - os: linux
-      env: DB=mariadb:10.1
+      arch: s390x
+      dist: focal
   include:
     - os: linux
-      env: DB=build
+      env: DB=mariadb:10.8
     - os: linux
-      env: DB=mariadb:10.1
+      compiler: clang
+      env: DB=mariadb:10.7
     - os: linux
-      env: DB=mariadb:10.2
+      env: DB=mariadb:10.6
     - os: linux
-      env: DB=mariadb:10.3
+      env: DB=mariadb:10.5
     - os: linux
       env: DB=mariadb:10.4
     - os: linux
-      compiler: gcc
-      env: DB=mariadb:10.5
-    - os: linux
-      compiler: clang
-      env: DB=mariadb:10.5
+      env: DB=mariadb:10.3
+    - env: SKYSQL=true
+    - env: SKYSQL_HA=true MAXSCALE_TEST_DISABLE=true
     - os: osx
       compiler: gcc
-      env: DB=mariadb:10.5
+      env: DB=mariadb:10.8
       addons:
-        mariadb: '10.5'
+        mariadb: '10.8'
       before_script:
         - brew update
         - brew install openssl
         - brew install libiodbc
         - brew install mariadb
     - os: linux
-      env: DB=mariadb:10.2 PACKET=8M MAXSCALE_VERSION=2.1.8
-    - os: linux
-      env: DB=mysql:5.5
-    - os: linux
-      env: DB=mysql:5.6
+      env: DB=mariadb:10.8 PACKET=8M MAXSCALE_VERSION=2.5.3
     - os: linux
       env: DB=mysql:5.7
-
+    - os: linux
+      arch: s390x
+      dist: focal
+
 script:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$DB" = "build" ] ; then .travis/build/build.sh; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$DB" = "build" ] ; then docker build -t build:latest --label build .travis/build/; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ] ; then .travis/script.sh; fi
+  - if [[ "$DB" == build* ]] ; then .travis/build/build.sh; fi
+  - if [[ "$DB" == build* ]] ; then docker build -t build:10.6 --label build .travis/build/; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_ARCH" != "s390x" ] ; then .travis/script.sh; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then .travis/osx.sh; fi
+  - if [ "$TRAVIS_ARCH" = "s390x" ]; then .travis/s390x.sh; fi
diff --git a/.travis/build/Dockerfile b/.travis/build/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM ubuntu:bionic
+FROM ubuntu:xenial
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r mysql && useradd -r -g mysql mysql
@@ -57,18 +57,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 RUN { \
-		echo "mariadb-server-10.5" mysql-server/root_password password 'unused'; \
-		echo "mariadb-server-10.5" mysql-server/root_password_again password 'unused'; \
+		echo "mariadb-server-10.6" mysql-server/root_password password 'unused'; \
+		echo "mariadb-server-10.6" mysql-server/root_password_again password 'unused'; \
 	} | debconf-set-selections
 
 RUN apt-get update -y
 RUN apt-get install -y software-properties-common wget
-RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
-RUN apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net F1656F24C74CD1D8
-RUN echo 'deb http://yum.mariadb.org/galera/repo/deb bionic main' > /etc/apt/sources.list.d/galera-test-repo.list
-RUN apt-get update -y
+#RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
+#RUN apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net F1656F24C74CD1D8
+#RUN echo 'deb http://yum.mariadb.org/galera/repo/deb xenial main' > /etc/apt/sources.list.d/galera-test-repo.list
+#RUN apt-get update -y
+
+RUN apt-get install -y curl libdbi-perl rsync socat libnuma1 libaio1 zlib1g-dev libreadline5 libjemalloc1 libsnappy1v5 libcrack2
 
-RUN apt-get install -y curl libdbi-perl rsync socat galera3 libnuma1 libaio1 zlib1g-dev libreadline5 libjemalloc1 libsnappy1v5 libcrack2
+#RUN apt-get install -y galera3
 
 COPY *.deb /root/
 RUN chmod 777 /root/*
@@ -77,16 +79,17 @@ RUN dpkg --install /root/mysql-common*
 RUN dpkg --install /root/mariadb-common*
 RUN dpkg -R --unpack /root/
 RUN apt-get install -f -y
-
+RUN ls -lrt /etc/mysql
+RUN ls -lrt /etc/mysql/mariadb.conf.d
 RUN rm -rf /var/lib/apt/lists/* \
-    	&& sed -ri 's/^user\s/#&/' /etc/mysql/my.cnf /etc/mysql/conf.d/* \
+    	&& sed -ri 's/^user\s/#&/' /etc/mysql/my.cnf /etc/mysql/mariadb.conf.d/*.cnf \
     	&& rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql /var/run/mysqld \
     	&& chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \
     	&& chmod 777 /var/run/mysqld \
     	&& find /etc/mysql/ -name '*.cnf' -print0 \
     		| xargs -0 grep -lZE '^(bind-address|log)' \
     		| xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/' \
-    	&& echo '[mysqld]\nskip-host-cache\nskip-name-resolve' > /etc/mysql/conf.d/docker.cnf
+    	&& echo '[mysqld]\nskip-host-cache\nskip-name-resolve' > /etc/mysql/mariadb.conf.d/docker.cnf
 
 VOLUME /var/lib/mysql
 

diff --git a/.travis/build/build.sh b/.travis/build/build.sh
@@ -4,22 +4,22 @@ echo "**************************************************************************
 echo "* searching for last complete build"
 echo "**************************************************************************"
 
-wget -q -o /dev/null index.html http://hasky.askmonty.org/archive/10.5/
+wget -q -o /dev/null index.html http://hasky.askmonty.org/archive/10.6/
 grep -o ">build-[0-9]*" index.html | grep -o "[0-9]*" | tac | while read -r line ; do
 
-  curl -s --head http://hasky.askmonty.org/archive/10.5/build-$line/kvm-deb-bionic-amd64/md5sums.txt | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
+  curl -s --head http://hasky.askmonty.org/archive/10.6/build-$line/kvm-deb-xenial-amd64/md5sums.txt | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
   if [ $? = "0" ]; then
     echo "**************************************************************************"
     echo "* Processing $line"
     echo "**************************************************************************"
-    wget -q -o /dev/null -O $line.html  http://hasky.askmonty.org/archive/10.5/build-$line/kvm-deb-bionic-amd64/debs/binary/
+    wget -q -o /dev/null -O $line.html  http://hasky.askmonty.org/archive/10.6/build-$line/kvm-deb-xenial-amd64/debs/binary/
     grep -o ">[^\"]*\.deb" $line.html | grep -o "[^>]*\.deb" | while read -r file ; do
         if  [[ "$file" =~ ^mariadb-plugin.* ]] ;
         then
           echo "skipped file: $file"
         else
-          echo "download file: $file"
-          wget -q -o /dev/null -O .travis/build/$file http://hasky.askmonty.org/archive/10.5/build-$line/kvm-deb-bionic-amd64/debs/binary/$file
+          echo "download file: http://hasky.askmonty.org/archive/10.6/build-$line/kvm-deb-xenial-amd64/debs/binary/$file"
+          wget -q -o /dev/null -O .travis/build/$file http://hasky.askmonty.org/archive/10.6/build-$line/kvm-deb-xenial-amd64/debs/binary/$file
         fi
     done