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.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-06-13 18:36:09 +03:00
parent d46db415ce 8e3a4be45c
commit 984d7100cd
157 changed files with 3036 additions and 2605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql/service_my_crypt.h
View File

@@ -45,7 +45,7 @@ extern "C" {
/* The max key length of all supported algorithms */
#define MY_AES_MAX_KEY_LENGTH 32
#define MY_AES_CTX_SIZE 560
#define MY_AES_CTX_SIZE 600
enum my_aes_mode {
MY_AES_ECB, MY_AES_CBC