forked from pool/mariadb
Compare commits
23 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| cdb9860128 | |||
| bf34f5ded4 | |||
| 73e54b2368 | |||
| c50f4a3553 | |||
| 97aa4d5330 | |||
| f58efef7f6 | |||
| c1ca8023f5 | |||
| ae474ba9a5 | |||
| 91885303ba | |||
| 8a625392da | |||
| 3a87eed7fd | |||
| 5985c1d45b | |||
|
74eb6ff16a | ||
| 36bba8728d | |||
|
|
388c5b03c0 | ||
| 749f1b0b4d | |||
| e54b13f611 | |||
|
|
da7141809b | ||
| 7e0727f208 | |||
| 84c5eb4677 | |||
| 00148fab5d | |||
| adcfd4c111 | |||
| e2a9ec5e59 |
11
_constraints
11
_constraints
@@ -33,4 +33,15 @@
|
||||
</physicalmemory>
|
||||
</hardware>
|
||||
</overwrite>
|
||||
|
||||
<overwrite>
|
||||
<conditions>
|
||||
<arch>riscv64</arch>
|
||||
</conditions>
|
||||
<hardware>
|
||||
<disk>
|
||||
<size unit="G">23</size>
|
||||
</disk>
|
||||
</hardware>
|
||||
</overwrite>
|
||||
</constraints>
|
||||
|
||||
@@ -1,19 +1,7 @@
|
||||
Index: mariadb-10.11.3/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
|
||||
Index: b/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
|
||||
===================================================================
|
||||
--- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
|
||||
+++ mariadb-10.11.3/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
#include "rocksdb/rocksdb_namespace.h"
|
||||
|
||||
struct CompactionIterationStats {
|
||||
Index: mariadb-10.11.3/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
|
||||
===================================================================
|
||||
--- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
|
||||
+++ mariadb-10.11.3/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
|
||||
--- a/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
|
||||
+++ b/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#pragma once
|
||||
@@ -21,11 +9,11 @@ Index: mariadb-10.11.3/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
|
||||
+#include <cstdint>
|
||||
#include "rocksdb/env.h"
|
||||
#include "rocksdb/file_system.h"
|
||||
|
||||
Index: mariadb-10.11.3/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
|
||||
#include "rocksdb/system_clock.h"
|
||||
Index: b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
|
||||
===================================================================
|
||||
--- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
|
||||
+++ mariadb-10.11.3/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
|
||||
--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
|
||||
+++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
|
||||
@@ -8,6 +8,7 @@
|
||||
#pragma once
|
||||
#ifndef ROCKSDB_LITE
|
||||
@@ -34,10 +22,10 @@ Index: mariadb-10.11.3/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpo
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include "rocksdb/status.h"
|
||||
Index: mariadb-10.11.3/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
|
||||
Index: b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
|
||||
===================================================================
|
||||
--- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
|
||||
+++ mariadb-10.11.3/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
|
||||
--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
|
||||
+++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <string>
|
||||
@@ -46,10 +34,10 @@ Index: mariadb-10.11.3/storage/rocksdb/rocksdb/table/block_based/data_block_hash
|
||||
|
||||
#include "rocksdb/slice.h"
|
||||
|
||||
Index: mariadb-10.11.3/storage/rocksdb/rocksdb/util/string_util.h
|
||||
Index: b/storage/rocksdb/rocksdb/util/string_util.h
|
||||
===================================================================
|
||||
--- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/util/string_util.h
|
||||
+++ mariadb-10.11.3/storage/rocksdb/rocksdb/util/string_util.h
|
||||
--- a/storage/rocksdb/rocksdb/util/string_util.h
|
||||
+++ b/storage/rocksdb/rocksdb/util/string_util.h
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
@@ -58,15 +46,3 @@ Index: mariadb-10.11.3/storage/rocksdb/rocksdb/util/string_util.h
|
||||
|
||||
#include "rocksdb/rocksdb_namespace.h"
|
||||
|
||||
Index: mariadb-10.11.3/tpool/aio_linux.cc
|
||||
===================================================================
|
||||
--- mariadb-10.11.3.orig/tpool/aio_linux.cc
|
||||
+++ mariadb-10.11.3/tpool/aio_linux.cc
|
||||
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fi
|
||||
# include <cstdio>
|
||||
# include <libaio.h>
|
||||
# include <sys/syscall.h>
|
||||
+# include <cstdio>
|
||||
|
||||
/**
|
||||
Invoke the io_getevents() system call, without timeout parameter.
|
||||
|
||||
@@ -57,7 +57,7 @@ mysql_install_db --defaults-file=$TEST_RUN_DIR/my.cnf \
|
||||
\
|
||||
echo '>>> Invoking mysqld' \
|
||||
/usr/sbin/mysqld --defaults-file=$TEST_RUN_DIR/my.cnf& \
|
||||
sleep 2 \
|
||||
sleep 10 \
|
||||
\
|
||||
echo ">>> Creating \'$TEST_DB\' database, (credentials: $TEST_USER, $TEST_PASS)" \
|
||||
mysqladmin --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild password abuildpw \
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e25fac00aeb34610faf62182836a14e3310c0ca5d882e9109f63bd8dfdc3542d
|
||||
size 108221481
|
||||
@@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmaxf6gACgkQ8WVvJMdM
|
||||
0diboxAA7mHaK3gKRt0Ghko+HeQqhyDovPBSaxM+Z/2SY3KxHSbkzVLnMSOVn4Wy
|
||||
Jj4dHBDRTpZqBmLep5Xi0qgYRoiVaUC4hBmk4oAD7rRRLSf3LYVTHtst5HZeIRMm
|
||||
XuP/+egoP/Jb6C14cZilzB7nEc31mNpCqhARShm2fQmZ+SuKBoiUrYfNKH4/fqd2
|
||||
KbOCWxigitOieWKPUMk+g+qBa2ETbWOzcWvhECeavLJ+kgGIm43KRJ17lyHlBbFR
|
||||
Cey/XHfVrdpCmV9uqJectnfnXTFqZ/uxINMKMyX2I53tB7oNBzGa4feOwqhlQiUd
|
||||
raiaCdbit7fs1ud9yDDW41gJzopR7i/X2PRWk7w+zl8ioNiCu/KlSOs2naPeCzez
|
||||
dRbNxU8Samjey8uprXMyioAsrX8gv7al/eFVqgxxCumc3nO7Umpmi2tHvWx+B98T
|
||||
8HEbY7p31qCxk+fkwqcZc03g1p2XcxsfVb5jzzYxjk08g3zZAIueDab9umViIPBH
|
||||
S0JYwUbm0bktUW5E3qaMEh9UA6Tu8L2b9q+eESRllYqNsB3mU5ik6gLBd8Ly5GQ4
|
||||
UTKRq+oYjqZt9X7m1jQJ9IdIQtwMfxhDJa0mPvekB8abT80CuzXwStYvA9n1QMas
|
||||
QgRhRpG2yoCoL/u5BwtjvyzPKYTYvC/jc8pk/A+CJCgFHTAC4o8=
|
||||
=fqEG
|
||||
-----END PGP SIGNATURE-----
|
||||
3
mariadb-11.8.3.tar.gz
Normal file
3
mariadb-11.8.3.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1014a85c768de8f9e9c6d4bf0b42617f3b1588be1ad371f71674ea32b87119c0
|
||||
size 119640174
|
||||
16
mariadb-11.8.3.tar.gz.asc
Normal file
16
mariadb-11.8.3.tar.gz.asc
Normal file
@@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmiKsoIACgkQ8WVvJMdM
|
||||
0di8IRAArKdP5ZA5WSqhqpAdw5zWNiPi9stjdtSXRmH44Q5LSxmOjVOs+3yJgZMh
|
||||
JIsgnssu6n0Zc56uzN4IoQAQKAUaDvEDgqiUj0x1O2DwljqA6yUFSzmf+ROq9RRV
|
||||
jNBkgOUgwQeNjQykDn0gjl0HDRG8TV7/GzFYtz2y0lVFuzMfc2IMMLgZ5ypPuCRt
|
||||
hUbyyfsArJw6hvjpLZ06XPYEGmVbCUcaN1ciP2kp7Ril6a0ELqHoOkJ0EN2ZNrX3
|
||||
v8rPfiYdEanvMnVRuRSoKpaRACP5bjXI8VMXWF4et64XRxe+rikEl4EJzbLiUosL
|
||||
fcyiYGDGWHN4CaYk14K6PIwZ7WR6Nj3xgyzg8Lj8e7+OJtr7ph4nTZrXcv885Vod
|
||||
XOlooYPQbdsfkG4l5N42twAK22fEqp3B6AfOLJrGvrU/qnWjoS52N8P8A/RXn5yr
|
||||
a+WAaVM8zrYbge7kSflysxwr8a4X+3BKazxL4Ag6nF01RYT0l98F2VarRhC6jEr0
|
||||
j31o2w3Pyirs1Ay0EV4gIMPBOrFKSmNfCauaDubzkvyO9MVzUBLJkoE6Q8SyV0AE
|
||||
xwQSUXuETDrqrvS07lNdNyqKeNB97m9iEwINoabhTmnAK08OJuMe9Gh9SzMoF6lZ
|
||||
pQZBOgTBnE1Duo4oDkYvpsXiVbI5WieA/djoATKVcvUgUIjjSLM=
|
||||
=pgKj
|
||||
-----END PGP SIGNATURE-----
|
||||
13
mariadb-fix-testsuite-openssl3.2.3.patch
Normal file
13
mariadb-fix-testsuite-openssl3.2.3.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
Index: mariadb-11.6.1/mysql-test/main/init_connect.test
|
||||
===================================================================
|
||||
--- mariadb-11.6.1.orig/mysql-test/main/init_connect.test
|
||||
+++ mariadb-11.6.1/mysql-test/main/init_connect.test
|
||||
@@ -46,7 +46,7 @@ select @a;
|
||||
# We got disconnected after receiving the above error message; any further
|
||||
# requests should fail with a notice that no one's listening to us.
|
||||
# --error CR_SERVER_GONE_ERROR,CR_SERVER_LOST
|
||||
---error 2013,2006
|
||||
+--error 2013,2006,2026
|
||||
select @a;
|
||||
connection con0;
|
||||
drop table t1;
|
||||
104
mariadb.changes
104
mariadb.changes
@@ -1,3 +1,107 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 4 15:47:44 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
|
||||
|
||||
- Update to 11.8.3:
|
||||
https://mariadb.com/docs/release-notes/community-server/mariadb-11-8-series/mariadb-11.8.3-release-notes
|
||||
https://mariadb.com/docs/release-notes/community-server/changelogs/changelogs-mariadb-11-8-series/mariadb-11.8.3-changelog
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 5 17:11:37 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
|
||||
|
||||
- Update to 11.8.2:
|
||||
https://mariadb.com/kb/en/mariadb-11-8-2-release-notes/
|
||||
https://mariadb.com/kb/en/mariadb-11-8-2-changelog/
|
||||
- Remove patch included in upstream release
|
||||
* mariadb-11.7.2-MDEV-36078-PCRE2-10.45-breaks-main.func_regexp_pcre-.patch
|
||||
- Refresh gcc13-fix.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 7 14:04:55 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
|
||||
|
||||
- Update list of skipped tests
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 24 21:57:38 UTC 2025 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
|
||||
|
||||
- Fix galera condition in SLFO
|
||||
- Fix exclude list for galera-related files when galera is disabled
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 15 05:59:24 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- fix build with pcre2 10.45 boo#1241198, adding
|
||||
mariadb-11.7.2-MDEV-36078-PCRE2-10.45-breaks-main.func_regexp_pcre-.patch
|
||||
based on upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 4 19:02:40 UTC 2025 - Andreas Schwab <schwab@suse.de>
|
||||
|
||||
- Update constraints for riscv64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 19 21:55:34 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
|
||||
|
||||
- Update list of skipped tests
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 19 07:05:37 UTC 2025 - Jiri Slaby <jslaby@suse.cz>
|
||||
|
||||
- drop unknown options, this yields nothing in the sources:
|
||||
grep -rwE 'WITH_LIBEVENT|WITH_LIBEDIT|WITH_EDITLINE|WITH_XTRADB_STORAGE_ENGINE|WITH_CSV_STORAGE_ENGINE|WITH_HANDLERSOCKET_STORAGE_ENGINE|WITH_INNODB_MEMCACHED|WITH_INNODB_DISALLOW_WRITES|WITH_LIBARCHIVE'
|
||||
- set -DWITH_READLINE=OFF as it is a bool (and not =0)
|
||||
- drop DEFAULT_CHARSET=utf8mb4 and
|
||||
DEFAULT_COLLATION=utf8mb4_unicode_520_ci to pick up the defaults
|
||||
(still utf8mb4, but utf8mb4_uca1400_ai_ci).
|
||||
See https://jira.mariadb.org/browse/MDEV-36113
|
||||
- add readline-devel to requires, so it is picked up (WITH_READLINE=OFF above
|
||||
translates to "use lib from system"). Now we have:
|
||||
CMakeCache.txt:READLINE_LIBRARY:FILEPATH=/usr/lib64/libreadline.so
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 14 14:41:28 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
|
||||
|
||||
- Update to 11.7.2:
|
||||
https://mariadb.com/kb/en/mariadb-11-7-2-release-notes/
|
||||
https://mariadb.com/kb/en/mariadb-11-7-2-changelog/
|
||||
* fixes for the following security vulnerabilities:
|
||||
11.7.2: CVE-2025-21490
|
||||
* fixes bsc#1236823
|
||||
- Remove extra compiler flags. These don't seem to be needed anymore
|
||||
and were overwriting predefined flags
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 26 19:23:02 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
|
||||
|
||||
- Update to 11.6.2:
|
||||
https://mariadb.com/kb/en/mariadb-11-6-2-release-notes/
|
||||
https://mariadb.com/kb/en/mariadb-11-6-2-changelog/
|
||||
- Update list of skipped tests
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 26 16:59:42 UTC 2024 - Angel Yankov <angel.yankov@suse.com>
|
||||
|
||||
- Fix test for SSL connection init with openssl 3.2.3.
|
||||
* Added mariadb-fix-testsuite-openssl3.2.3.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 14 21:10:35 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
|
||||
|
||||
- Update to 11.6.1:
|
||||
https://mariadb.com/kb/en/mariadb-11-6-1-release-notes/
|
||||
https://mariadb.com/kb/en/mariadb-11-6-1-changelog/
|
||||
- Update list of skipped tests
|
||||
- Refresh gcc13-fix.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 11 10:36:05 UTC 2024 - Andreas Schwab <schwab@suse.de>
|
||||
|
||||
- Reduce race in %mysql_testserver_start
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 22 22:31:04 UTC 2024 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
|
||||
|
||||
- Read defaults during mysql_upgrade to respect client configuration
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 20 17:00:30 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
|
||||
|
||||
|
||||
37
mariadb.spec
37
mariadb.spec
@@ -38,7 +38,7 @@
|
||||
%endif
|
||||
# Build galera on SLE. Galera requires mariadb >= 10.5, so only
|
||||
# build it on SLE15SP3 onwards
|
||||
%if 0%{?is_opensuse} || 0%{?sle_version} >= 150300
|
||||
%if 0%{?is_opensuse} || 0%{?sle_version} >= 150300 || 0%{?suse_version} >= 1600
|
||||
%bcond_without galera
|
||||
%else
|
||||
%bcond_with galera
|
||||
@@ -52,14 +52,14 @@
|
||||
# Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available
|
||||
%define with_cracklib_plugin 0
|
||||
Name: mariadb
|
||||
Version: 11.5.2
|
||||
Version: 11.8.3
|
||||
Release: 0
|
||||
Summary: Server part of MariaDB
|
||||
License: SUSE-GPL-2.0-with-FLOSS-exception
|
||||
Group: Productivity/Databases/Servers
|
||||
URL: https://www.mariadb.org
|
||||
Source: https://downloads.mariadb.com/MariaDB/%{name}-%{version}/source/%{name}-%{version}.tar.gz
|
||||
Source1: https://downloads.mariadb.com/MariaDB/%{name}-%{version}/source/%{name}-%{version}.tar.gz.asc
|
||||
Source: https://archive.mariadb.org/%{name}-%{version}/source/%{name}-%{version}.tar.gz
|
||||
Source1: https://archive.mariadb.org/%{name}-%{version}/source/%{name}-%{version}.tar.gz.asc
|
||||
Source2: %{name}.keyring
|
||||
Source4: README.debug
|
||||
Source5: suse-test-run
|
||||
@@ -80,6 +80,7 @@ Patch6: mariadb-10.4.12-harden_setuid.patch
|
||||
Patch7: mariadb-10.4.12-fix-install-db.patch
|
||||
Patch10: fix-pamdir.patch
|
||||
Patch11: gcc13-fix.patch
|
||||
Patch12: mariadb-fix-testsuite-openssl3.2.3.patch
|
||||
# needed for bison SQL parser and wsrep API
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake
|
||||
@@ -112,6 +113,7 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: procps
|
||||
# Some tests and myrocks_hotbackup script need python3
|
||||
BuildRequires: python3
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: sqlite
|
||||
BuildRequires: sysuser-tools
|
||||
BuildRequires: tcpd-devel
|
||||
@@ -361,6 +363,7 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
|
||||
%patch -P 10 -p1
|
||||
%endif
|
||||
%patch -P 11 -p1
|
||||
%patch -P 12 -p1
|
||||
|
||||
cp %{_sourcedir}/suse-test-run .
|
||||
|
||||
@@ -390,22 +393,14 @@ cat %{SOURCE50} | tee -a mysql-test/unstable-tests
|
||||
|
||||
%build
|
||||
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
||||
EXTRA_FLAGS="-Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter"
|
||||
# Mariadb devs seems to fall in love with -Werror option
|
||||
EXTRA_FLAGS="${EXTRA_FLAGS} -Wno-error"
|
||||
export CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS"
|
||||
export CXXFLAGS="$CFLAGS -felide-constructors"
|
||||
%cmake -DWITH_SSL=system \
|
||||
-DWITH_LIBWRAP=ON \
|
||||
-DENABLED_PROFILING=ON \
|
||||
-DENABLE_DEBUG_SYNC=OFF \
|
||||
-DWITH_PIC=ON \
|
||||
-DWITH_ZLIB=system \
|
||||
-DWITH_LIBEVENT=system \
|
||||
-DWITH_JEMALLOC=no \
|
||||
-DWITH_READLINE=0 \
|
||||
-DWITH_LIBEDIT=0 \
|
||||
-DWITH_EDITLINE=system \
|
||||
-DWITH_READLINE=OFF \
|
||||
-DINSTALL_LAYOUT=RPM \
|
||||
-DWITH_LZ4=system \
|
||||
-DMYSQL_UNIX_ADDR="%{_rundir}/mysql/mysql.sock" \
|
||||
@@ -413,8 +408,6 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
|
||||
-DINSTALL_MYSQLSHAREDIR=share/%{name} \
|
||||
-DWITH_COMMENT="MariaDB rpm" \
|
||||
-DWITH_EXTRA_CHARSET=all \
|
||||
-DDEFAULT_CHARSET=utf8mb4 \
|
||||
-DDEFAULT_COLLATION=utf8mb4_unicode_520_ci \
|
||||
-DWITH_INNOBASE_STORAGE_ENGINE=1 \
|
||||
-DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
|
||||
%if 0%{with_oqgraph} < 1
|
||||
@@ -427,28 +420,18 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
|
||||
-DPLUGIN_ROCKSDB=NO \
|
||||
%endif
|
||||
-DPYTHON_SHEBANG=%{python_path} \
|
||||
-DWITH_XTRADB_STORAGE_ENGINE=1 \
|
||||
-DWITH_CSV_STORAGE_ENGINE=1 \
|
||||
-DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \
|
||||
-DWITH_INNODB_MEMCACHED=ON \
|
||||
-DWITH_EMBEDDED_SERVER=true \
|
||||
%if %{with galera}
|
||||
-DWITH_WSREP=ON \
|
||||
-DWITH_INNODB_DISALLOW_WRITES=1 \
|
||||
%endif
|
||||
-DWITH_LIBARCHIVE=ON \
|
||||
-DWITH_MARIABACKUP=ON \
|
||||
-DCOMPILATION_COMMENT="MariaDB package" \
|
||||
-DDENABLE_DOWNLOADS=false \
|
||||
-DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \
|
||||
-DINSTALL_LIBDIR_RPM="%{_lib}" \
|
||||
-DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \
|
||||
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$CFLAGS" \
|
||||
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$CXXFLAGS" \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DINSTALL_SQLBENCHDIR=share \
|
||||
-DCMAKE_C_FLAGS="$CFLAGS" \
|
||||
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now -Wl,-Bsymbolic -Wl,-Bsymbolic-functions" \
|
||||
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now -Wl,-Bsymbolic -Wl,-Bsymbolic-functions" \
|
||||
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now -Wl,-Bsymbolic -Wl,-Bsymbolic-functions" \
|
||||
@@ -599,8 +582,8 @@ filelist galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariaback
|
||||
touch mariadb-galera-exclude.files
|
||||
%else
|
||||
filelist_excludes galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariabackup wsrep_sst_mysqldump wsrep_sst_rsync wsrep_sst_rsync_wan wsrep_sst_backup >mariadb-galera-exclude.files
|
||||
echo "%exclude %{_datadir}/mysql/systemd/use_galera_new_cluster.conf" >>mariadb-galera-exclude.files
|
||||
echo "%exclude %{_datadir}/mysql/wsrep_notify" >>mariadb-galera-exclude.files
|
||||
echo "%exclude %{_datadir}/mariadb/systemd/use_galera_new_cluster.conf" >>mariadb-galera-exclude.files
|
||||
echo "%exclude %{_datadir}/mariadb/wsrep_notify" >>mariadb-galera-exclude.files
|
||||
%endif
|
||||
|
||||
# mariadb-bench.files
|
||||
|
||||
@@ -116,7 +116,7 @@ mysql_upgrade() {
|
||||
echo "Running upgrade itself..."
|
||||
echo "It will do some chek first and report all errors and tries to correct them"
|
||||
echo
|
||||
if /usr/bin/mysql_upgrade --no-defaults --force --socket="$protected/mysql.sock"; then
|
||||
if /usr/bin/mysql_upgrade --force --socket="$protected/mysql.sock"; then
|
||||
echo "Everything upgraded successfully"
|
||||
up_ok=""
|
||||
rm -f "$mariadb_status_dir/.mariadb_run_upgrade"
|
||||
|
||||
@@ -48,4 +48,10 @@ binlog.max_binlog_total_size : since 11.4.2 - all
|
||||
|
||||
main.mysqld--help-aria : since 11.5.2 - all
|
||||
plugins.feedback_plugin_load : since 11.5.2 - all
|
||||
plugins.parsec : since 11.6.1 - all
|
||||
unit.conc_connection : since 11.6.2 - all
|
||||
innodb.log_file_name : since 11.6.2 - all
|
||||
main.connect : since 11.6.2 - all
|
||||
main.ssl_cipher : since 11.7.2 - all
|
||||
unit.conc_async : since 11.7.2 - aarch64
|
||||
|
||||
|
||||
Reference in New Issue
Block a user