Skip to content

Support MySQL 8.0.32 and later #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Support MySQL 8.0.32 and later #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b346157
Fix #266, script get to be worked but not verified the result is corr…
yoku0825 Nov 9, 2023
c6e46b5
Fix for #261
yoku0825 Nov 10, 2023
cb0228e
Fix for https://github.com/mysql/mysql-server/commit/951cb5106cb8677c…
yoku0825 Nov 10, 2023
3fd7665
Merge pull request #1 from yoku0825/idea_for_266
yoku0825 Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/audit_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
#define my_rwlock_init(lock, unused) native_rw_init(lock)
#endif

#if (!defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80031)
using TABLE_LIST = Table_ref;
#endif

class THD;

#define MAX_NUM_QUERY_TABLE_ELEM 100
Expand Down
9 changes: 8 additions & 1 deletion offset-extract/offset-extract.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,14 @@ VIEW_TABLES=""
if echo $MYVER | grep -P '^(8\.0)' > /dev/null
then
LEX_COMMENT='printf ", 0"'
VIEW_TABLES="print_offset TABLE_LIST view_tables"
if echo $MYVER | grep -P '^8\.0\.(3[2-9]|[4-9]\d)' > /dev/null
then
# MySQL 8.0.32 and laters
VIEW_TABLES="print_offset Table_ref view_tables"
else
# MySQL 8.0.32 and ealiers
VIEW_TABLES="print_offset TABLE_LIST view_tables"
fi
else
LEX_COMMENT="print_offset LEX comment"
VIEW_TABLES='printf ", 0"'
Expand Down
21 changes: 20 additions & 1 deletion src/audit_handler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,25 @@ static bool parse_length_encoded_string(
, data_length
, nchars_max
);
#elif MYSQL_VERSION_ID >= 80031
/*
TODO: Migrate the data itself to UTF8MB4,
this is still UTF8MB3 printed in a UTF8MB4 column.
*/
const char *well_formed_error_pos = NULL, *cannot_convert_error_pos = NULL,
*from_end_pos = NULL;
copy_length = well_formed_copy_nchars(
&my_charset_utf8mb3_bin
, dest
, dest_size
, from_cs
, *ptr
, data_length
, nchars_max
, &well_formed_error_pos
, &cannot_convert_error_pos
, &from_end_pos
);
#else
/*
TODO: Migrate the data itself to UTF8MB4,
Expand Down Expand Up @@ -1086,7 +1105,7 @@ ssize_t Audit_json_formatter::event_format(ThdSesData *pThdData, IWriter *writer
uint errors = 0;

size_t len = copy_and_convert(to, to_amount,
#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100504
#if (defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 100504) || (!defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80031)
&my_charset_utf8mb3_general_ci,
#else
&my_charset_utf8_general_ci,
Expand Down