diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-10-05 09:19:31 +0100 |
| commit | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (patch) | |
| tree | ad799ccacfb459b809b02b9c115ed4befb93b4c1 /databases/mysql80-server/files/patch-sql_stream__cipher.h | |
| parent | 0b1510fe1f98f82da6f3481cb6c58957022d9211 (diff) | |
| parent | b057c68280a2f2a7b3d1fbac36f7b034e1fdf593 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/main
Diffstat (limited to 'databases/mysql80-server/files/patch-sql_stream__cipher.h')
| -rw-r--r-- | databases/mysql80-server/files/patch-sql_stream__cipher.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/mysql80-server/files/patch-sql_stream__cipher.h b/databases/mysql80-server/files/patch-sql_stream__cipher.h index 58730a516873..63c2e8b5707b 100644 --- a/databases/mysql80-server/files/patch-sql_stream__cipher.h +++ b/databases/mysql80-server/files/patch-sql_stream__cipher.h @@ -1,4 +1,4 @@ ---- sql/stream_cipher.h.orig 2024-07-12 19:15:25 UTC +--- sql/stream_cipher.h.orig 2025-08-19 10:33:36 UTC +++ sql/stream_cipher.h @@ -27,6 +27,7 @@ #include <openssl/evp.h> @@ -6,14 +6,14 @@ #include <string> +#include <vector> - /** - @file stream_cipher.h -@@ -35,7 +36,7 @@ - binary log files. + #include "my_char_traits.h" + +@@ -38,7 +39,7 @@ using Key_string = */ --typedef std::basic_string<unsigned char> Key_string; -+typedef std::vector<unsigned char> Key_string; + using Key_string = +- std::basic_string<unsigned char, my_char_traits<unsigned char>>; ++ std::vector<unsigned char>; /** @class Stream_cipher |