mirror of
https://github.com/MariaDB/server.git
synced 2026-05-17 20:37:12 +02:00
Merge branch '10.11' into 11.4
This commit is contained in:
commit
40f7084661
391 changed files with 14213 additions and 2900 deletions
|
|
@ -316,6 +316,9 @@ static inline int safe_strcat(char *dst, size_t dst_size, const char *src)
|
|||
#ifdef __cplusplus
|
||||
static inline char *safe_str(char *str)
|
||||
{ return str ? str : const_cast<char*>(""); }
|
||||
|
||||
static inline const char *safe_str(const LEX_CSTRING *lcs)
|
||||
{ return lcs && lcs->str ? lcs->str : ""; }
|
||||
#endif
|
||||
|
||||
static inline const char *safe_str(const char *str)
|
||||
|
|
|
|||
|
|
@ -444,11 +444,10 @@ extern "C" int madvise(void *addr, size_t len, int behav);
|
|||
/*
|
||||
Suppress uninitialized variable warning without generating code.
|
||||
*/
|
||||
#if defined(__GNUC__) && !defined(WITH_UBSAN)
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
/*
|
||||
GCC specific self-initialization which inhibits the warning.
|
||||
clang and static analysis will complain loudly about this
|
||||
so compile those under WITH_UBSAN.
|
||||
clang and static analysis will complain loudly about this.
|
||||
*/
|
||||
#define UNINIT_VAR(x) x= x
|
||||
#elif defined(FORCE_INIT_OF_VARS)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue