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

MENT-1019.

Browse Source 
Audit-plugin related fixes.
This commit is contained in:
Alexey Botchkov 2021-08-11 23:00:37 +04:00
parent 582cf12f94
commit 38b79d7295
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_audit.h
View File

@ -155,7 +155,7 @@ void mysql_audit_general(THD *thd, uint event_subtype,
DBUG_ENTER("mysql_audit_general"); DBUG_ENTER("mysql_audit_general");
if (mysql_audit_general_enabled()) if (mysql_audit_general_enabled())
{ {
char user_buff[MAX_USER_HOST_SIZE]; char user_buff[MAX_USER_HOST_SIZE+1];
mysql_event_general event; mysql_event_general event;
event.event_subclass= event_subtype; event.event_subclass= event_subtype;

5
sql/sql_prepare.cc
View File

@ -3442,6 +3442,11 @@ static void mysql_stmt_execute_common(THD *thd,
stmt_id == LAST_STMT_ID, read_types)) stmt_id == LAST_STMT_ID, read_types))
{ {
my_error(ER_MALFORMED_PACKET, MYF(0)); my_error(ER_MALFORMED_PACKET, MYF(0));
/*
Let's set the thd->query_string so the audit plugin
can report the executed query that failed.
*/
thd->set_query_inner(stmt->query_string);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }

6
tests/mysql_client_test.c
View File

@ -5256,10 +5256,10 @@ static void test_manual_sample()
{ {
unsigned int param_count; unsigned int param_count;
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
short small_data; short small_data= 1;
int int_data; int int_data= 2;
int rc; int rc;
char str_data[50]; char str_data[50]= "std_data";
ulonglong affected_rows; ulonglong affected_rows;
MYSQL_BIND my_bind[3]; MYSQL_BIND my_bind[3];
my_bool is_null; my_bool is_null;