diff --git a/include/MySQL_Thread.h b/include/MySQL_Thread.h index 3cfa58eaa..eb4ad1a48 100644 --- a/include/MySQL_Thread.h +++ b/include/MySQL_Thread.h @@ -534,7 +534,7 @@ class MySQL_Threads_Handler int connpoll_reset_queue_length; char *eventslog_filename; int eventslog_filesize; - int eventslog_memory_history_size; + int eventslog_buffer_history_size; int eventslog_default_log; int eventslog_format; char *auditlog_filename; diff --git a/include/proxysql_structs.h b/include/proxysql_structs.h index 3a1cfee2b..980952729 100644 --- a/include/proxysql_structs.h +++ b/include/proxysql_structs.h @@ -892,7 +892,7 @@ __thread char * mysql_thread___ssl_p2s_crlpath; /* variables used by events log */ __thread char * mysql_thread___eventslog_filename; __thread int mysql_thread___eventslog_filesize; -__thread int mysql_thread___eventslog_memory_history_size; +__thread int mysql_thread___eventslog_buffer_history_size; __thread int mysql_thread___eventslog_default_log; __thread int mysql_thread___eventslog_format; @@ -1065,7 +1065,7 @@ extern __thread char * mysql_thread___ssl_p2s_crlpath; /* variables used by events log */ extern __thread char * mysql_thread___eventslog_filename; extern __thread int mysql_thread___eventslog_filesize; -extern __thread int mysql_thread___eventslog_memory_history_size; +extern __thread int mysql_thread___eventslog_buffer_history_size; extern __thread int mysql_thread___eventslog_default_log; extern __thread int mysql_thread___eventslog_format; diff --git a/lib/MySQL_Logger.cpp b/lib/MySQL_Logger.cpp index c4047a6c7..e89689100 100644 --- a/lib/MySQL_Logger.cpp +++ b/lib/MySQL_Logger.cpp @@ -737,7 +737,7 @@ void MySQL_Logger::audit_set_datadir(char *s) { }; void MySQL_Logger::log_request(MySQL_Session *sess, MySQL_Data_Stream *myds) { - int elmhs = mysql_thread___eventslog_memory_history_size; + int elmhs = mysql_thread___eventslog_buffer_history_size; if (elmhs == 0) { if (events.enabled==false) return; if (events.logfile==NULL) return; diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp index e5036c994..4ce926b84 100644 --- a/lib/MySQL_Thread.cpp +++ b/lib/MySQL_Thread.cpp @@ -349,7 +349,7 @@ static char * mysql_thread_variables_names[]= { (char *)"enable_load_data_local_infile", (char *)"eventslog_filename", (char *)"eventslog_filesize", - (char *)"eventslog_memory_history_size", + (char *)"eventslog_buffer_history_size", (char *)"eventslog_default_log", (char *)"eventslog_format", (char *)"auditlog_filename", @@ -1070,7 +1070,7 @@ MySQL_Threads_Handler::MySQL_Threads_Handler() { variables.server_version=strdup((char *)"8.0.11"); // changed in 2.6.0 , was 5.5.30 variables.eventslog_filename=strdup((char *)""); // proxysql-mysql-eventslog is recommended variables.eventslog_filesize=100*1024*1024; - variables.eventslog_memory_history_size=0; + variables.eventslog_buffer_history_size=0; variables.eventslog_default_log=0; variables.eventslog_format=1; variables.auditlog_filename=strdup((char *)""); @@ -2242,7 +2242,7 @@ char ** MySQL_Threads_Handler::get_variables_list() { // logs VariablesPointers_int["auditlog_filesize"] = make_tuple(&variables.auditlog_filesize, 1024*1024, 1*1024*1024*1024, false); VariablesPointers_int["eventslog_filesize"] = make_tuple(&variables.eventslog_filesize, 1024*1024, 1*1024*1024*1024, false); - VariablesPointers_int["eventslog_memory_history_size"] = make_tuple(&variables.eventslog_memory_history_size, 0, 8*1024*1024, false); + VariablesPointers_int["eventslog_buffer_history_size"] = make_tuple(&variables.eventslog_buffer_history_size, 0, 8*1024*1024, false); VariablesPointers_int["eventslog_default_log"] = make_tuple(&variables.eventslog_default_log, 0, 1, false); // various VariablesPointers_int["long_query_time"] = make_tuple(&variables.long_query_time, 0, 20*24*3600*1000, false); @@ -4371,9 +4371,9 @@ void MySQL_Thread::refresh_variables() { REFRESH_VARIABLE_CHAR(server_version); REFRESH_VARIABLE_INT(eventslog_filesize); - REFRESH_VARIABLE_INT(eventslog_memory_history_size); + REFRESH_VARIABLE_INT(eventslog_buffer_history_size); { - int elmhs = mysql_thread___eventslog_memory_history_size; + int elmhs = mysql_thread___eventslog_buffer_history_size; if (GloMyLogger->MyLogCB->buffer_size != elmhs) { GloMyLogger->MyLogCB->resize(elmhs); }