update mariadb to 10.3.34

48 files changed, 13 insertions, 5 deletions

diff --git a/mariadb-10.3/build.Dockerfile b/mariadb-10.3/build.Dockerfile
index 6fdaae1..d362443 100644
--- a/mariadb-10.3/build.Dockerfile
+++ b/mariadb-10.3/build.Dockerfile
@@ -3,7 +3,15 @@ FROM debian/eol:wheezy
 RUN apt-get update \
   && apt-get install -y \
       software-properties-common \
-      devscripts
+      devscripts \
+      dh-exec \
+      wget
+RUN wget https://cmake.org/files/v2.8/cmake-2.8.12.1.tar.gz
+RUN tar xzf cmake-2.8.12.1.tar.gz
+RUN cd cmake-2.8.12.1 \
+  && ./bootstrap \
+  && make \
+  && make install
 RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 CBCB082A1BB943DB
 RUN echo "deb http://mirror2.hs-esslingen.de/mariadb/repo/10.3/debian wheezy main" >> /etc/apt/sources.list
 RUN echo "deb-src http://mirror2.hs-esslingen.de/mariadb/repo/10.3/debian wheezy main" >> /etc/apt/sources.list
@@ -11,11 +19,11 @@ RUN apt-get update \
   && apt-get build-dep -y mariadb-server-10.3
 RUN git clone https://github.com/MariaDB/server.git
 RUN cd server \
+  && echo checkout 10.3.34 \
   && git fetch \
-  && git checkout mariadb-10.4.18
-RUN apt-get update \
-  && apt-get install -y \
-      dh-exec
+  && git checkout mariadb-10.3.34 \
+  && git checkout mariadb-10.3.28 debian/control \
+  && git checkout mariadb-10.3.30 cmake/submodules.cmake
 RUN cd server \
   && ./debian/autobake-deb.sh
 
diff --git a/mariadb-10.3/out/libmariadb-dev-compat_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadb-dev-compat_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index 6f31f14..0000000
--- a/mariadb-10.3/out/libmariadb-dev-compat_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/libmariadb-dev-compat_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadb-dev-compat_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..ea19f17
--- /dev/null
+++ b/mariadb-10.3/out/libmariadb-dev-compat_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/libmariadb-dev_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadb-dev_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index 27d7c72..0000000
--- a/mariadb-10.3/out/libmariadb-dev_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/libmariadb-dev_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadb-dev_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..b602618
--- /dev/null
+++ b/mariadb-10.3/out/libmariadb-dev_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/libmariadb3-compat_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadb3-compat_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index d2a16d6..0000000
--- a/mariadb-10.3/out/libmariadb3-compat_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/libmariadb3-compat_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadb3-compat_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..39a314b
--- /dev/null
+++ b/mariadb-10.3/out/libmariadb3-compat_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/libmariadb3_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadb3_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index 04dce69..0000000
--- a/mariadb-10.3/out/libmariadb3_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/libmariadb3_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadb3_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..8f068a4
--- /dev/null
+++ b/mariadb-10.3/out/libmariadb3_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/libmariadbclient18_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadbclient18_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index 7357b11..0000000
--- a/mariadb-10.3/out/libmariadbclient18_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/libmariadbclient18_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadbclient18_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..5430a9b
--- /dev/null
+++ b/mariadb-10.3/out/libmariadbclient18_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/libmariadbd-dev_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadbd-dev_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index ac28ee3..0000000
--- a/mariadb-10.3/out/libmariadbd-dev_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-server-10.3_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadbd-dev_10.3.34+maria~wheezy_amd64.deb
index f14dc51..1944c58 100644
--- a/mariadb-10.3/out/mariadb-server-10.3_10.3.28+maria~wheezy_amd64.deb
+++ b/mariadb-10.3/out/libmariadbd-dev_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/libmariadbd19_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadbd19_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index a1e712f..0000000
--- a/mariadb-10.3/out/libmariadbd19_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/libmariadbd19_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmariadbd19_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..0bde123
--- /dev/null
+++ b/mariadb-10.3/out/libmariadbd19_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/libmysqlclient18_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmysqlclient18_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index f609b68..0000000
--- a/mariadb-10.3/out/libmysqlclient18_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/libmysqlclient18_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/libmysqlclient18_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..5f3e490
--- /dev/null
+++ b/mariadb-10.3/out/libmysqlclient18_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mariadb-backup_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-backup_10.3.34+maria~wheezy_amd64.deb
index 833d889..53779f3 100644
--- a/mariadb-10.3/out/mariadb-backup_10.3.28+maria~wheezy_amd64.deb
+++ b/mariadb-10.3/out/mariadb-backup_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mariadb-client-10.3_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-client-10.3_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index 7bcfedb..0000000
--- a/mariadb-10.3/out/mariadb-client-10.3_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-client-10.3_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-client-10.3_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..74e4717
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-client-10.3_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mariadb-client-core-10.3_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-client-core-10.3_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index b6b18da..0000000
--- a/mariadb-10.3/out/mariadb-client-core-10.3_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-client-core-10.3_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-client-core-10.3_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..b1c4f22
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-client-core-10.3_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mariadb-client_10.3.28+maria~wheezy_all.deb b/mariadb-10.3/out/mariadb-client_10.3.28+maria~wheezy_all.deb
deleted file mode 100644
index fac304e..0000000
--- a/mariadb-10.3/out/mariadb-client_10.3.28+maria~wheezy_all.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-client_10.3.34+maria~wheezy_all.deb b/mariadb-10.3/out/mariadb-client_10.3.34+maria~wheezy_all.deb
new file mode 100644
index 0000000..fd451e2
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-client_10.3.34+maria~wheezy_all.deb
diff --git a/mariadb-10.3/out/mariadb-common_10.3.28+maria~wheezy_all.deb b/mariadb-10.3/out/mariadb-common_10.3.28+maria~wheezy_all.deb
deleted file mode 100644
index 74a8d01..0000000
--- a/mariadb-10.3/out/mariadb-common_10.3.28+maria~wheezy_all.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-common_10.3.34+maria~wheezy_all.deb b/mariadb-10.3/out/mariadb-common_10.3.34+maria~wheezy_all.deb
new file mode 100644
index 0000000..29b997e
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-common_10.3.34+maria~wheezy_all.deb
diff --git a/mariadb-10.3/out/mariadb-plugin-connect_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-plugin-connect_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index eb4b0f2..0000000
--- a/mariadb-10.3/out/mariadb-plugin-connect_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-plugin-connect_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-plugin-connect_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..b01d1f4
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-plugin-connect_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mariadb-plugin-gssapi-client_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-plugin-gssapi-client_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index adf9c82..0000000
--- a/mariadb-10.3/out/mariadb-plugin-gssapi-client_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-plugin-gssapi-client_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-plugin-gssapi-client_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..e030418
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-plugin-gssapi-client_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mariadb-plugin-gssapi-server_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-plugin-gssapi-server_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index faa1984..0000000
--- a/mariadb-10.3/out/mariadb-plugin-gssapi-server_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-plugin-gssapi-server_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-plugin-gssapi-server_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..ebae52b
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-plugin-gssapi-server_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mariadb-plugin-mroonga_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-plugin-mroonga_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index 790e9cb..0000000
--- a/mariadb-10.3/out/mariadb-plugin-mroonga_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-plugin-mroonga_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-plugin-mroonga_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..36e9e80
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-plugin-mroonga_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mariadb-plugin-oqgraph_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-plugin-oqgraph_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index ae60c9a..0000000
--- a/mariadb-10.3/out/mariadb-plugin-oqgraph_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-plugin-oqgraph_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-plugin-oqgraph_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..9f31d31
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-plugin-oqgraph_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mariadb-plugin-spider_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-plugin-spider_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index f602493..0000000
--- a/mariadb-10.3/out/mariadb-plugin-spider_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-plugin-spider_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-plugin-spider_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..3499f32
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-plugin-spider_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mariadb-server-10.3_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-server-10.3_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..c7afef6
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-server-10.3_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mariadb-server-core-10.3_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-server-core-10.3_10.3.34+maria~wheezy_amd64.deb
index 578b9f7..07f5cdb 100644
--- a/mariadb-10.3/out/mariadb-server-core-10.3_10.3.28+maria~wheezy_amd64.deb
+++ b/mariadb-10.3/out/mariadb-server-core-10.3_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mariadb-server_10.3.28+maria~wheezy_all.deb b/mariadb-10.3/out/mariadb-server_10.3.28+maria~wheezy_all.deb
deleted file mode 100644
index afb2b21..0000000
--- a/mariadb-10.3/out/mariadb-server_10.3.28+maria~wheezy_all.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-server_10.3.34+maria~wheezy_all.deb b/mariadb-10.3/out/mariadb-server_10.3.34+maria~wheezy_all.deb
new file mode 100644
index 0000000..cfbd295
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-server_10.3.34+maria~wheezy_all.deb
diff --git a/mariadb-10.3/out/mariadb-test-data_10.3.28+maria~wheezy_all.deb b/mariadb-10.3/out/mariadb-test-data_10.3.28+maria~wheezy_all.deb
deleted file mode 100644
index 0c0f203..0000000
--- a/mariadb-10.3/out/mariadb-test-data_10.3.28+maria~wheezy_all.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-test-data_10.3.34+maria~wheezy_all.deb b/mariadb-10.3/out/mariadb-test-data_10.3.34+maria~wheezy_all.deb
new file mode 100644
index 0000000..4cace71
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-test-data_10.3.34+maria~wheezy_all.deb
diff --git a/mariadb-10.3/out/mariadb-test_10.3.28+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-test_10.3.28+maria~wheezy_amd64.deb
deleted file mode 100644
index fe7d11d..0000000
--- a/mariadb-10.3/out/mariadb-test_10.3.28+maria~wheezy_amd64.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mariadb-test_10.3.34+maria~wheezy_amd64.deb b/mariadb-10.3/out/mariadb-test_10.3.34+maria~wheezy_amd64.deb
new file mode 100644
index 0000000..87d99d7
--- /dev/null
+++ b/mariadb-10.3/out/mariadb-test_10.3.34+maria~wheezy_amd64.deb
diff --git a/mariadb-10.3/out/mysql-common_10.3.28+maria~wheezy_all.deb b/mariadb-10.3/out/mysql-common_10.3.28+maria~wheezy_all.deb
deleted file mode 100644
index e69de29..0000000
--- a/mariadb-10.3/out/mysql-common_10.3.28+maria~wheezy_all.deb
+++ /dev/null
diff --git a/mariadb-10.3/out/mysql-common_10.3.34+maria~wheezy_all.deb b/mariadb-10.3/out/mysql-common_10.3.34+maria~wheezy_all.deb
new file mode 100644
index 0000000..c2d207c
--- /dev/null
+++ b/mariadb-10.3/out/mysql-common_10.3.34+maria~wheezy_all.deb