database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

fix build and some warnings

Browse Source
This commit is contained in:
kevg
2016-11-24 17:36:02 +03:00
committed by Aleksey Midenkov
parent 48d924693f
commit 1bedafb733
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@ -1979,7 +1979,7 @@ bool THD::notify_shared_lock(MDL_context_owner *ctx_in_use,
if (!thd_table->needs_reopen()) if (!thd_table->needs_reopen())
{ {
signalled|= mysql_lock_abort_for_thread(this, thd_table); signalled|= mysql_lock_abort_for_thread(this, thd_table);
if (this && WSREP(this) && wsrep_thd_is_BF(this, FALSE)) if (WSREP(this) && wsrep_thd_is_BF(this, FALSE))
{ {
WSREP_DEBUG("remove_table_from_cache: %llu", WSREP_DEBUG("remove_table_from_cache: %llu",
(unsigned long long) this->real_id); (unsigned long long) this->real_id);

17
storage/xtradb/include/fsp0fsp.h
View File

@ -156,15 +156,14 @@ these are only used in MySQL 5.7 and used for compatibility. */
#define FSP_FLAGS_MASK_PAGE_COMPRESSION \ #define FSP_FLAGS_MASK_PAGE_COMPRESSION \
((~(~0U << FSP_FLAGS_WIDTH_PAGE_COMPRESSION)) \ ((~(~0U << FSP_FLAGS_WIDTH_PAGE_COMPRESSION)) \
<< FSP_FLAGS_POS_PAGE_COMPRESSION) << FSP_FLAGS_POS_PAGE_COMPRESSION)
/** Bit mask of the PAGE_COMPRESSION_LEVEL field */
/** Bit mask of the in-memory ATOMIC_WRITES field */ #define FSP_FLAGS_MASK_PAGE_COMPRESSION_LEVEL \
#define FSP_FLAGS_MASK_MEM_ATOMIC_WRITES \ ((~(~0U << FSP_FLAGS_WIDTH_PAGE_COMPRESSION_LEVEL)) \
(3U << FSP_FLAGS_MEM_ATOMIC_WRITES) << FSP_FLAGS_POS_PAGE_COMPRESSION_LEVEL)
/** Bit mask of the ATOMIC_WRITES field */
/** Bit mask of the in-memory COMPRESSION_LEVEL field */ #define FSP_FLAGS_MASK_ATOMIC_WRITES \
#define FSP_FLAGS_MASK_MEM_COMPRESSION_LEVEL \ ((~(~0U << FSP_FLAGS_WIDTH_ATOMIC_WRITES)) \
(15U << FSP_FLAGS_MEM_COMPRESSION_LEVEL) << FSP_FLAGS_POS_ATOMIC_WRITES)
/** Return the value of the POST_ANTELOPE field */ /** Return the value of the POST_ANTELOPE field */
#define FSP_FLAGS_GET_POST_ANTELOPE(flags) \ #define FSP_FLAGS_GET_POST_ANTELOPE(flags) \
((flags & FSP_FLAGS_MASK_POST_ANTELOPE) \ ((flags & FSP_FLAGS_MASK_POST_ANTELOPE) \