database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.11 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2024-12-02 11:35:34 +02:00
parent 866a8ea673 3d23adb766
commit 2719cc4925
420 changed files with 6452 additions and 4162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/encryption.cc
View File

@@ -59,8 +59,9 @@ uint ctx_size(unsigned int, unsigned int)
} /* extern "C" */
int initialize_encryption_plugin(st_plugin_int *plugin)
int initialize_encryption_plugin(void *plugin_)
{
st_plugin_int *plugin= static_cast<st_plugin_int *>(plugin_);
if (encryption_manager)
return 1;
@@ -107,8 +108,9 @@ int initialize_encryption_plugin(st_plugin_int *plugin)
return 0;
}
int finalize_encryption_plugin(st_plugin_int *plugin)
int finalize_encryption_plugin(void *plugin_)
{
st_plugin_int *plugin= static_cast<st_plugin_int *>(plugin_);
int deinit_status= 0;
bool used= plugin_ref_to_int(encryption_manager) == plugin;