File tree Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ path=`dirname $0`
3131# the destination
3232#
3333
34- extra_flags=" $pentium64_cflags $debug_cflags -fsanitize=undefined -DWITH_UBSAN -Wno-conversion -Wno-uninitialized"
34+ extra_flags=" $pentium64_cflags $debug_cflags -fsanitize=undefined -DWITH_UBSAN -Wno-conversion -Wno-uninitialized -Wno-unused-parameter "
3535extra_configs=" $pentium_configs $debug_configs -DWITH_UBSAN=ON -DMYSQL_MAINTAINER_MODE=NO --without-spider"
3636
3737. " $path /FINISH.sh"
Original file line number Diff line number Diff line change @@ -1964,12 +1964,12 @@ typedef struct st_foreign_key_info
19641964 DBUG_ASSERT (fields_nullable);
19651965 DBUG_ASSERT (field < n_fields);
19661966 size_t bit= size_t {field} + referenced * n_fields;
1967- #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
1967+ #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 8
19681968# pragma GCC diagnostic push
19691969# pragma GCC diagnostic ignored "-Wconversion"
19701970#endif
19711971 fields_nullable[bit / 8 ]|= static_cast <unsigned char >(1 << (bit % 8 ));
1972- #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
1972+ #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 8
19731973# pragma GCC diagnostic pop
19741974#endif
19751975 }
Original file line number Diff line number Diff line change @@ -368,7 +368,7 @@ void wsrep_abort_thd(THD *bf_thd,
368368 /* Note that when you use RSU node is desynced from cluster, thus WSREP(thd)
369369 might not be true.
370370 */
371- if ((WSREP (bf_thd)
371+ if ((WSREP_NNULL (bf_thd)
372372 || ((WSREP_ON || bf_thd->variables .wsrep_OSU_method == WSREP_OSU_RSU)
373373 && wsrep_thd_is_toi (bf_thd))
374374 || bf_thd->lex ->sql_command == SQLCOM_KILL)
Original file line number Diff line number Diff line change @@ -83,12 +83,12 @@ lock_rec_set_nth_bit(
8383 byte_index = i / 8 ;
8484 bit_index = i % 8 ;
8585
86- #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
86+ #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 8
8787# pragma GCC diagnostic push
8888# pragma GCC diagnostic ignored "-Wconversion" /* GCC 4 and 5 need this here */
8989#endif
9090 ((byte*) &lock[1 ])[byte_index] |= static_cast <byte>(1 << bit_index);
91- #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 6
91+ #if defined __GNUC__ && !defined __clang__ && __GNUC__ < 8
9292# pragma GCC diagnostic pop
9393#endif
9494#ifdef SUX_LOCK_GENERIC
You can’t perform that action at this time.
0 commit comments