Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 38c9a9189f | |||
|
|
8aa0dad6e4 | ||
|
|
5bcadda088 | ||
| 1e63f43fbd | |||
| 97fb2b0716 | |||
| b1c8785e8f |
@ -1 +0,0 @@
|
||||
1
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1 @@
|
||||
/*/
|
||||
/*.rpm
|
||||
/*.tar.gz
|
||||
mysql-8.4.9.tar.gz
|
||||
|
||||
@ -1,120 +0,0 @@
|
||||
Index: boost/pool/pool.hpp
|
||||
===================================================================
|
||||
--- boost/pool/pool.hpp (revision 78317)
|
||||
+++ boost/pool/pool.hpp (revision 78326)
|
||||
@@ -27,4 +27,6 @@
|
||||
#include <boost/pool/poolfwd.hpp>
|
||||
|
||||
+// std::numeric_limits
|
||||
+#include <boost/limits.hpp>
|
||||
// boost::integer::static_lcm
|
||||
#include <boost/integer/common_factor_ct.hpp>
|
||||
@@ -358,4 +360,11 @@
|
||||
}
|
||||
|
||||
+ size_type max_chunks() const
|
||||
+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
|
||||
+ size_type partition_size = alloc_size();
|
||||
+ size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
|
||||
+ return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
|
||||
+ }
|
||||
+
|
||||
static void * & nextof(void * const ptr)
|
||||
{ //! \returns Pointer dereferenced.
|
||||
@@ -377,5 +388,7 @@
|
||||
//! the first time that object needs to allocate system memory.
|
||||
//! The default is 32. This parameter may not be 0.
|
||||
- //! \param nmax_size is the maximum number of chunks to allocate in one block.
|
||||
+ //! \param nmax_size is the maximum number of chunks to allocate in one block.
|
||||
+ set_next_size(nnext_size);
|
||||
+ set_max_size(nmax_size);
|
||||
}
|
||||
|
||||
@@ -400,7 +413,7 @@
|
||||
}
|
||||
void set_next_size(const size_type nnext_size)
|
||||
- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
|
||||
- //! \returns nnext_size.
|
||||
- next_size = start_size = nnext_size;
|
||||
+ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
|
||||
+ BOOST_USING_STD_MIN();
|
||||
+ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks());
|
||||
}
|
||||
size_type get_max_size() const
|
||||
@@ -410,5 +423,6 @@
|
||||
void set_max_size(const size_type nmax_size)
|
||||
{ //! Set max_size.
|
||||
- max_size = nmax_size;
|
||||
+ BOOST_USING_STD_MIN();
|
||||
+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());
|
||||
}
|
||||
size_type get_requested_size() const
|
||||
@@ -713,7 +727,7 @@
|
||||
BOOST_USING_STD_MIN();
|
||||
if(!max_size)
|
||||
- next_size <<= 1;
|
||||
+ set_next_size(next_size << 1);
|
||||
else if( next_size*partition_size/requested_size < max_size)
|
||||
- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
|
||||
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
|
||||
|
||||
// initialize it,
|
||||
@@ -753,7 +767,7 @@
|
||||
BOOST_USING_STD_MIN();
|
||||
if(!max_size)
|
||||
- next_size <<= 1;
|
||||
+ set_next_size(next_size << 1);
|
||||
else if( next_size*partition_size/requested_size < max_size)
|
||||
- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
|
||||
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
|
||||
|
||||
// initialize it,
|
||||
@@ -797,4 +811,6 @@
|
||||
//! \returns Address of chunk n if allocated ok.
|
||||
//! \returns 0 if not enough memory for n chunks.
|
||||
+ if (n > max_chunks())
|
||||
+ return 0;
|
||||
|
||||
const size_type partition_size = alloc_size();
|
||||
@@ -845,7 +861,7 @@
|
||||
BOOST_USING_STD_MIN();
|
||||
if(!max_size)
|
||||
- next_size <<= 1;
|
||||
+ set_next_size(next_size << 1);
|
||||
else if( next_size*partition_size/requested_size < max_size)
|
||||
- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
|
||||
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
|
||||
|
||||
// insert it into the list,
|
||||
Index: libs/pool/test/test_bug_6701.cpp
|
||||
===================================================================
|
||||
--- libs/pool/test/test_bug_6701.cpp (revision 78326)
|
||||
+++ libs/pool/test/test_bug_6701.cpp (revision 78326)
|
||||
@@ -0,0 +1,27 @@
|
||||
+/* Copyright (C) 2012 Étienne Dupuis
|
||||
+*
|
||||
+* Use, modification and distribution is subject to the
|
||||
+* Boost Software License, Version 1.0. (See accompanying
|
||||
+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
|
||||
+*/
|
||||
+
|
||||
+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701)
|
||||
+
|
||||
+#include <boost/pool/object_pool.hpp>
|
||||
+#include <boost/limits.hpp>
|
||||
+
|
||||
+int main()
|
||||
+{
|
||||
+ boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768);
|
||||
+
|
||||
+ void *x = p.malloc();
|
||||
+ BOOST_ASSERT(!x);
|
||||
+
|
||||
+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());
|
||||
+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());
|
||||
+
|
||||
+ void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768);
|
||||
+ BOOST_ASSERT(!y);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
@ -1,6 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/rhel-gating.functional}
|
||||
@ -104,7 +104,7 @@ ExcludeArch: %{ix86}
|
||||
|
||||
Name: %{majorname}%{majorversion}
|
||||
Version: %{package_version}
|
||||
Release: 1%{?with_debug:.debug}%{?dist}
|
||||
Release: 1%{?with_debug:.debug}%{?dist}.alma.1
|
||||
Summary: MySQL client programs and shared libraries
|
||||
URL: http://www.mysql.com
|
||||
|
||||
@ -169,7 +169,7 @@ BuildRequires: mecab-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: libzstd-devel
|
||||
BuildRequires: libcurl-devel
|
||||
%ifnarch aarch64 s390x
|
||||
%ifnarch aarch64 s390x riscv64
|
||||
BuildRequires: numactl-devel
|
||||
BuildRequires: libquadmath-devel
|
||||
%endif
|
||||
@ -605,10 +605,10 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
|
||||
-DSYSTEMD_SERVICE_NAME="%{daemon_name}" \
|
||||
-DSYSTEMD_PID_DIR="%{pidfiledir}" \
|
||||
-DWITH_INNODB_MEMCACHED=ON \
|
||||
%ifnarch aarch64 s390x
|
||||
%ifnarch aarch64 s390x riscv64
|
||||
-DWITH_NUMA=ON \
|
||||
%endif
|
||||
%ifarch s390x
|
||||
%ifarch s390x riscv64
|
||||
-DUSE_LD_GOLD=OFF \
|
||||
%endif
|
||||
-DWITH_ROUTER=OFF \
|
||||
@ -1146,6 +1146,9 @@ popd
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue May 26 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4.9-1.alma.1
|
||||
- Add riscv64 support
|
||||
|
||||
* Wed May 06 2026 Michal Schorm <mschorm@redhat.com> - 8.4.9-1
|
||||
- Rebase to 8.4.9
|
||||
|
||||
|
||||
10
plans.fmf
10
plans.fmf
@ -1,10 +0,0 @@
|
||||
/rhel-gating:
|
||||
plan:
|
||||
import:
|
||||
url: https://pkgs.devel.redhat.com/git/tests/mysql
|
||||
name: /plans/versioned/mysql84/gating
|
||||
/rhel-no-gating:
|
||||
plan:
|
||||
import:
|
||||
url: https://pkgs.devel.redhat.com/git/tests/mysql
|
||||
name: /plans/versioned/mysql84/no-gating
|
||||
@ -1,13 +0,0 @@
|
||||
# Set up global ignore list
|
||||
ignore:
|
||||
# mysql-test/ directory contains an extensive test-suite of about 20.000 files;
|
||||
# It is very time consuming to be fully analysed and the results aren't useful anyway
|
||||
# It is expected the tests change during rebases, as the underlying functionality the test evolve
|
||||
# Some of the tests contain broken or problematic code, however that is on purpose
|
||||
- /usr/share/mysql-test/
|
||||
|
||||
badfuncs:
|
||||
ignore:
|
||||
# udf_example.so can be ignored, as it is an example of how to write loadable functions
|
||||
# Loadable functions were formerly know as UDF (User Defined Functions).
|
||||
- /usr/lib64/mysql/plugin/udf_example.so
|
||||
Loading…
Reference in New Issue
Block a user