1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small cleanup

Browse Source 
* my_aes.h doesn't compile without my_global.h
* typo in a comment
* redundant condition
* if encryption plugin fails, there's no encryption_key_manager
  at plugin deinit time
* encryption plugin tests must run when plugin.so is present,
  not when a plugin is active (otherwise the test will be skipped
  when plugin fails to initialize).
This commit is contained in:
Sergei Golubchik 2015-03-28 10:55:31 +01:00
parent 88632726e8
commit 5fcba6eb26
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/my_aes.h
View File

@ -22,6 +22,8 @@
#ifndef MY_AES_INCLUDED #ifndef MY_AES_INCLUDED
#define MY_AES_INCLUDED #define MY_AES_INCLUDED
#include <my_global.h>
typedef int Crypt_result; typedef int Crypt_result;
#define AES_OK 0 #define AES_OK 0

2
include/mysql/service_thd_alloc.h
View File

@ -16,7 +16,7 @@
/** /**
@file @file
This service provdes functions to allocate memory in a connection local This service provides functions to allocate memory in a connection local
memory pool. The memory allocated there will be automatically freed at the memory pool. The memory allocated there will be automatically freed at the
end of the statement, don't use it for allocations that should live longer end of the statement, don't use it for allocations that should live longer
than that. For short living allocations this is more efficient than than that. For short living allocations this is more efficient than

3
mysql-test/include/have_example_key_management_plugin.inc
View File

@ -1,7 +1,6 @@
-- source encryption_algorithms.inc -- source encryption_algorithms.inc
if (`select count(*) = 0 from information_schema.plugins if (!$EXAMPLE_KEY_MANAGEMENT_SO)
where plugin_name = 'example_key_management' and plugin_status='active'`)
{ {
--skip Needs example_key_management --skip Needs example_key_management
} }

3
mysql-test/include/have_file_key_management_plugin.inc
View File

@ -1,7 +1,6 @@
-- source encryption_algorithms.inc -- source encryption_algorithms.inc
if (`select count(*) = 0 from information_schema.plugins if (!$FILE_KEY_MANAGEMENT_SO)
where plugin_name = 'file_key_management' and plugin_status='active'`)
{ {
--skip Needs file_key_management --skip Needs file_key_management
} }

3
mysys/my_fopen.c
View File

@ -87,8 +87,7 @@ FILE *my_fopen(const char *filename, int flags, myf MyFlags)
my_errno=errno; my_errno=errno;
DBUG_PRINT("error",("Got error %d on open",my_errno)); DBUG_PRINT("error",("Got error %d on open",my_errno));
if (MyFlags & (MY_FFNF | MY_FAE | MY_WME)) if (MyFlags & (MY_FFNF | MY_FAE | MY_WME))
my_error((flags & O_RDONLY) || (flags == O_RDONLY ) ? EE_FILENOTFOUND : my_error((flags & O_RDONLY) ? EE_FILENOTFOUND : EE_CANTCREATEFILE,
EE_CANTCREATEFILE,
MYF(ME_BELL+ME_WAITTANG), filename, my_errno); MYF(ME_BELL+ME_WAITTANG), filename, my_errno);
DBUG_RETURN((FILE*) 0); DBUG_RETURN((FILE*) 0);
} /* my_fopen */ } /* my_fopen */

5
sql/encryption_keys.cc
View File

@ -59,14 +59,13 @@ int initialize_encryption_key_management_plugin(st_plugin_int *plugin)
int finalize_encryption_key_management_plugin(st_plugin_int *plugin) int finalize_encryption_key_management_plugin(st_plugin_int *plugin)
{ {
DBUG_ASSERT(encryption_key_manager);
if (plugin->plugin->deinit && plugin->plugin->deinit(NULL)) if (plugin->plugin->deinit && plugin->plugin->deinit(NULL))
{ {
DBUG_PRINT("warning", ("Plugin '%s' deinit function returned error.", DBUG_PRINT("warning", ("Plugin '%s' deinit function returned error.",
plugin->name.str)); plugin->name.str));
} }
plugin_unlock(NULL, encryption_key_manager); if (encryption_key_manager)
plugin_unlock(NULL, encryption_key_manager);
encryption_key_manager= 0; encryption_key_manager= 0;
return 0; return 0;
} }