diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 18934bab1ce..86309ab91b4 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -1046,7 +1046,7 @@ class Client_field_extension: public Sql_alloc, public: Client_field_extension() { - memset(this, 0, sizeof(*this)); + memset((void*) this, 0, sizeof(*this)); } void copy_extended_metadata(MEM_ROOT *memroot, const Send_field_extended_metadata &src) diff --git a/mysql-test/main/innodb_ext_key,off.rdiff b/mysql-test/main/innodb_ext_key,off.rdiff index 4d6c65c9971..8061d87990b 100644 --- a/mysql-test/main/innodb_ext_key,off.rdiff +++ b/mysql-test/main/innodb_ext_key,off.rdiff @@ -1,5 +1,5 @@ ---- innodb_ext_key.result -+++ innodb_ext_key,off.result +--- main/innodb_ext_key.result ++++ main/innodb_ext_key,off.reject @@ -9,7 +9,7 @@ explain select count(*) from lineitem where l_orderkey=130 and l_shipdate='1992-07-01'; @@ -230,14 +230,14 @@ Handler_read_retry 0 Handler_read_rnd 0 @@ -314,8 +314,8 @@ - select * from t0, part ignore index (primary) + select straight_join * from t0, part ignore index (primary) where p_partkey=t0.a and p_size=1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t0 ALL NULL NULL NULL NULL 5 Using where -1 SIMPLE part eq_ref i_p_size i_p_size 9 const,dbt3_s001.t0.a 1 +1 SIMPLE t0 ALL NULL NULL NULL NULL 5 +1 SIMPLE part ref i_p_size i_p_size 5 const 5 Using index condition - select * from t0, part ignore index (primary) + select straight_join * from t0, part ignore index (primary) where p_partkey=t0.a and p_size=1; a p_partkey p_name p_mfgr p_brand p_type p_size p_container p_retailprice p_comment @@ -494,7 +494,7 @@ diff --git a/mysql-test/main/innodb_ext_key.result b/mysql-test/main/innodb_ext_key.result index 5b99fa4e30b..efd068ae880 100644 --- a/mysql-test/main/innodb_ext_key.result +++ b/mysql-test/main/innodb_ext_key.result @@ -311,12 +311,12 @@ create table t0 (a int); insert into t0 values (1), (2), (3), (4), (5); create index i_p_size on part(p_size); explain -select * from t0, part ignore index (primary) +select straight_join * from t0, part ignore index (primary) where p_partkey=t0.a and p_size=1; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t0 ALL NULL NULL NULL NULL 5 Using where 1 SIMPLE part eq_ref i_p_size i_p_size 9 const,dbt3_s001.t0.a 1 -select * from t0, part ignore index (primary) +select straight_join * from t0, part ignore index (primary) where p_partkey=t0.a and p_size=1; a p_partkey p_name p_mfgr p_brand p_type p_size p_container p_retailprice p_comment 2 2 blush rosy metallic lemon navajo Manufacturer#1 Brand#13 LARGE BRUSHED BRASS 1 LG CASE 902 final platelets hang f diff --git a/mysql-test/main/innodb_ext_key.test b/mysql-test/main/innodb_ext_key.test index af7bd9fe967..abec58a1d53 100644 --- a/mysql-test/main/innodb_ext_key.test +++ b/mysql-test/main/innodb_ext_key.test @@ -162,10 +162,10 @@ insert into t0 values (1), (2), (3), (4), (5); create index i_p_size on part(p_size); explain -select * from t0, part ignore index (primary) +select straight_join * from t0, part ignore index (primary) where p_partkey=t0.a and p_size=1; -select * from t0, part ignore index (primary) +select straight_join * from t0, part ignore index (primary) where p_partkey=t0.a and p_size=1; drop table t0; diff --git a/mysql-test/suite/gcol/disabled.def b/mysql-test/suite/gcol/disabled.def new file mode 100644 index 00000000000..77359887431 --- /dev/null +++ b/mysql-test/suite/gcol/disabled.def @@ -0,0 +1,12 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# : BUG# +# +# Do not use any TAB characters for whitespace. +# +############################################################################## +gcol.innodb_virtual_fk: MDEV-29181 Constant failures "InnoDB: tried to purge non-delete-marked record in index" diff --git a/storage/innobase/include/ut0byte.h b/storage/innobase/include/ut0byte.h index 7ed64c61c4b..2b70fac3c96 100644 --- a/storage/innobase/include/ut0byte.h +++ b/storage/innobase/include/ut0byte.h @@ -101,16 +101,6 @@ ut_bit_get_nth( /*===========*/ ulint a, /*!< in: ulint */ ulint n); /*!< in: nth bit requested */ -/*****************************************************************//** -Sets the nth bit of a ulint. -@return the ulint with the bit set as requested */ -UNIV_INLINE -ulint -ut_bit_set_nth( -/*===========*/ - ulint a, /*!< in: ulint */ - ulint n, /*!< in: nth bit requested */ - ibool val); /*!< in: value for the bit to set */ #include "ut0byte.inl" diff --git a/storage/innobase/include/ut0byte.inl b/storage/innobase/include/ut0byte.inl index a4b5d4a7d8f..dfa069c2732 100644 --- a/storage/innobase/include/ut0byte.inl +++ b/storage/innobase/include/ut0byte.inl @@ -88,22 +88,3 @@ ut_bit_get_nth( ut_ad(n < 8 * sizeof(ulint)); return(1 & (a >> n)); } - -/*****************************************************************//** -Sets the nth bit of a ulint. -@return the ulint with the bit set as requested */ -UNIV_INLINE -ulint -ut_bit_set_nth( -/*===========*/ - ulint a, /*!< in: ulint */ - ulint n, /*!< in: nth bit requested */ - ibool val) /*!< in: value for the bit to set */ -{ - ut_ad(n < 8 * sizeof(ulint)); - if (val) { - return(((ulint) 1 << n) | a); - } else { - return(~((ulint) 1 << n) & a); - } -} diff --git a/storage/mroonga/ha_mroonga.cpp b/storage/mroonga/ha_mroonga.cpp index a16c44a342a..ae8a39d63c9 100644 --- a/storage/mroonga/ha_mroonga.cpp +++ b/storage/mroonga/ha_mroonga.cpp @@ -14629,7 +14629,9 @@ enum_alter_inplace_result ha_mroonga::storage_check_if_supported_inplace_alter( MRN_ALTER_INPLACE_INFO_ADD_VIRTUAL_COLUMN | MRN_ALTER_INPLACE_INFO_ADD_STORED_BASE_COLUMN | ALTER_DROP_COLUMN | + ALTER_INDEX_ORDER | ALTER_COLUMN_NAME; + ; if (ha_alter_info->handler_flags & explicitly_unsupported_flags) { DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED); } else if ((ha_alter_info->handler_flags & supported_flags) ==