hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Johan Wikman
2019-05-15 15:47:36 +03:00
parent 2472911aac 0f85baabe1
commit a12a0af887
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION23.cmake
View File

@ -5,7 +5,7 @@
set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version") set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version")
set(MAXSCALE_VERSION_PATCH "7" CACHE STRING "Patch version") set(MAXSCALE_VERSION_PATCH "8" CACHE STRING "Patch version")
# This should only be incremented if a package is rebuilt # This should only be incremented if a package is rebuilt
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number") set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")

2
maxscale-system-test/mxs1980_blr_galera_server_ids.cpp
View File

@ -287,7 +287,7 @@ void setup_galera(TestConnections& test)
gc.stash_server_settings(i); gc.stash_server_settings(i);
// https://mariadb.com/kb/en/library/using-mariadb-gtids-with-mariadb-galera-cluster/#wsrep-gtid-mode // https://mariadb.com/kb/en/library/using-mariadb-gtids-with-mariadb-galera-cluster/#wsrep-gtid-mode
gc.add_server_setting(i, "wsrep_gtid_mode=ON"); gc.add_server_setting(i, "wsrep_gtid_mode=ON");
gc.add_server_setting(i, "wsrep_gtid_domain_id=13"); gc.add_server_setting(i, "wsrep_gtid_domain_id=0");
gc.add_server_setting(i, "gtid_domain_id=0"); gc.add_server_setting(i, "gtid_domain_id=0");
gc.add_server_setting(i, "log_slave_updates=1"); gc.add_server_setting(i, "log_slave_updates=1");
gc.add_server_setting(i, "log_bin=galera-cluster"); gc.add_server_setting(i, "log_bin=galera-cluster");

21
maxutils/maxbase/src/logger.cc
View File

@ -70,17 +70,20 @@ bool should_log_error()
struct this_unit struct this_unit
{ {
std::string ident; static const int MAX_IDENT_LEN = 256;
// Don't change to std::string. Order of destruction issue with logger.cc:this_unit.
char ident[MAX_IDENT_LEN + 1];
} this_unit; } this_unit;
std::string get_ident() std::string get_ident()
{ {
if (this_unit.ident.empty()) if (!this_unit.ident[0])
{ {
#ifdef __GNUC__ #ifdef __GNUC__
this_unit.ident = program_invocation_short_name; return program_invocation_short_name;
#else #else
this_unit.ident = "The Program"; return "The Program";
#endif #endif
} }
@ -98,7 +101,15 @@ namespace maxbase
// static // static
void Logger::set_ident(const std::string& ident) void Logger::set_ident(const std::string& ident)
{ {
this_unit.ident = ident; int len = ident.length();
if (len > this_unit.MAX_IDENT_LEN)
{
len = this_unit.MAX_IDENT_LEN;
}
this_unit.ident[len] = 0;
memcpy(this_unit.ident, ident.c_str(), len);
} }
std::unique_ptr<Logger> FileLogger::create(const std::string& filename) std::unique_ptr<Logger> FileLogger::create(const std::string& filename)