Merge pull request #4800 from sysown/v2.7_amd64_build_fix

CentOS7 Ubuntu16 build fix - v2.7
v2.7_fix
René Cannaò 1 year ago committed by GitHub
commit 6a8fb6cdab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -303,6 +303,7 @@ debian: $(REL_ARCH)-debian ;
fedora: $(REL_ARCH)-fedora ;
opensuse: $(REL_ARCH)-opensuse ;
ubuntu: $(REL_ARCH)-ubuntu ;
pkglist: $(REL_ARCH)-pkglist ;
amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensuse amd64-almalinux
amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg
@ -311,14 +312,18 @@ amd64-debian: debian10 debian10-dbg debian11 debian11-clang debian11-dbg debian1
amd64-fedora: fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg
amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
amd64-ubuntu: ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg ubuntu24 ubuntu24-clang ubuntu24-dbg
amd64-pkglist:
@make -nk amd64-packages 2>/dev/null | grep -Po '(?<=binaries/)proxysql\S+$$'
arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux
arm64-almalinux: almalinux8 almalinux9
arm64-centos: centos7 centos8 centos9
arm64-debian: debian10 debian11 debian12
arm64-fedora: fedora38 fedora39 fedora40
arm64-fedora: fedora38 fedora39 fedora40 fedora41
arm64-opensuse: opensuse15
arm64-ubuntu: ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24
arm64-pkglist:
@make -nk arm64-packages 2>/dev/null | grep -Po '(?<=binaries/)proxysql\S+$$'
almalinux%: build-almalinux% ;
centos%: build-centos% ;

@ -317,10 +317,10 @@ inline unsigned long long realtime_time() {
template<int FACTOR, typename T>
inline T overflow_safe_multiply(T val) {
static_assert(std::is_integral<T>::value, "T must be an integer type.");
static_assert(std::is_unsigned_v<T>, "T must be an unsigned integer type.");
static_assert(std::is_unsigned<T>::value, "T must be an unsigned integer type.");
static_assert(FACTOR > 0, "Negative factors are not supported.");
if constexpr (FACTOR == 0) return 0;
if (FACTOR == 0) return 0;
if (val == 0) return 0;
if (val > std::numeric_limits<T>::max() / FACTOR) return std::numeric_limits<T>::max();
return (val * FACTOR);

@ -555,7 +555,7 @@ uint64_t MySQL_Event::write_query_format_2_json(std::fstream *f) {
extern Query_Processor *GloQPro;
MySQL_Logger::MySQL_Logger() : metrics{0, 0, 0, 0, 0, 0, 0, 0, 0} {
MySQL_Logger::MySQL_Logger() : metrics{{0},{0},{0},{0},{0},{0},{0},{0},{0}} {
events.enabled=false;
events.base_filename=NULL;
events.datadir=NULL;

Loading…
Cancel
Save