1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-08 00:28:29 +03:00

Merge branch 'bb-11.8-release' into bb-12.1-release

This commit is contained in:
Oleksandr Byelkin
2025-11-04 22:47:26 +01:00
184 changed files with 3745 additions and 1373 deletions

View File

@@ -235,6 +235,7 @@ void old_mode_deprecated_warnings(ulonglong v);
#define NEW_MODE_TEST_WARNING1 NOW_DEFAULT
#define NEW_MODE_TEST_WARNING2 NOW_DEFAULT
#define NEW_MODE_FIX_DISK_TMPTABLE_COSTS NOW_DEFAULT
#define NEW_MODE_FIX_INDEX_STATS_FOR_ALL_NULLS NOW_DEFAULT
#define TEST_NEW_MODE_FLAG(thd, flag) \
(flag == NOW_DEFAULT ? TRUE : thd->variables.new_behavior & flag)
@@ -2824,16 +2825,16 @@ struct wait_for_commit
class Sp_caches
{
protected:
ulong m_sp_cache_version;
public:
sp_cache *sp_proc_cache;
sp_cache *sp_func_cache;
sp_cache *sp_package_spec_cache;
sp_cache *sp_package_body_cache;
Sp_caches()
:sp_proc_cache(NULL),
sp_func_cache(NULL),
sp_package_spec_cache(NULL),
sp_package_body_cache(NULL)
:m_sp_cache_version(0), sp_proc_cache(NULL), sp_func_cache(NULL),
sp_package_spec_cache(NULL), sp_package_body_cache(NULL)
{ }
~Sp_caches()
{
@@ -2843,19 +2844,22 @@ public:
DBUG_ASSERT(sp_package_spec_cache == NULL);
DBUG_ASSERT(sp_package_body_cache == NULL);
}
void sp_caches_swap(Sp_caches &rhs)
{
swap_variables(sp_cache*, sp_proc_cache, rhs.sp_proc_cache);
swap_variables(sp_cache*, sp_func_cache, rhs.sp_func_cache);
swap_variables(sp_cache*, sp_package_spec_cache, rhs.sp_package_spec_cache);
swap_variables(sp_cache*, sp_package_body_cache, rhs.sp_package_body_cache);
}
void sp_caches_clear();
/**
Clear content of sp related caches.
Don't delete cache objects itself.
*/
void sp_caches_empty();
ulong sp_cache_version() const
{
DBUG_ASSERT(m_sp_cache_version);
return m_sp_cache_version;
}
void set_sp_cache_version_if_needed(ulong version)
{
if (!m_sp_cache_version)
m_sp_cache_version= version;
}
};