diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-29 11:25:40 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-29 11:25:40 +0200 |
| commit | 5a00792c69065140a34315e3c5aec00bdbef8447 (patch) | |
| tree | aed2311a5a9a35e612363cc4871cfa4f89af44b1 | |
| parent | 51a4260f0047d00ced28256192e142b1570ffe05 (diff) | |
| parent | 7955e197d0ceca3108bd0d7036edaff0d7e7a9cf (diff) | |
| download | mariadb-git-5a00792c69065140a34315e3c5aec00bdbef8447.tar.gz | |
Merge 10.4 into 10.5
| -rw-r--r-- | mysql-test/suite/galera_sr/disabled.def | 3 | ||||
| -rw-r--r-- | sql/wsrep_mysqld.cc | 8 | ||||
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 15 | ||||
| -rw-r--r-- | storage/innobase/include/dict0mem.h | 3 |
4 files changed, 12 insertions, 17 deletions
diff --git a/mysql-test/suite/galera_sr/disabled.def b/mysql-test/suite/galera_sr/disabled.def index 2ad1e3e7cbd..d959c91a2a2 100644 --- a/mysql-test/suite/galera_sr/disabled.def +++ b/mysql-test/suite/galera_sr/disabled.def @@ -1,3 +1,6 @@ galera_sr_table_contents : missing file GCF-437 : test relies on InnoDB redo log size limitation GCF-1060 : MDEV-20848 Galera test failure on galera_sr.GCF_1060 +galera_sr_ddl_master : MDEV-20780 Galera test failure on galera_sr.galera_sr_ddl_master +GCF-1043A : MDEV-21170 Galera test failure on galera_sr.GCF-1043A + diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index e35d13be4c6..19d6f88478b 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -550,11 +550,11 @@ static std::string wsrep_server_incoming_address() { if (node_addr.size()) { - size_t const ip_len= wsrep_host_len(node_addr.c_str(), node_addr.size()); - if (ip_len + 7 /* :55555\0 */ < inc_addr_max) + size_t const ip_len_mdb= wsrep_host_len(node_addr.c_str(), node_addr.size()); + if (ip_len_mdb + 7 /* :55555\0 */ < inc_addr_max) { - memcpy (inc_addr, node_addr.c_str(), ip_len); - snprintf(inc_addr + ip_len, inc_addr_max - ip_len, ":%u", + memcpy (inc_addr, node_addr.c_str(), ip_len_mdb); + snprintf(inc_addr + ip_len_mdb, inc_addr_max - ip_len_mdb, ":%u", (int)mysqld_port); } else diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 5f5454deb93..786a176fbb2 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -165,10 +165,7 @@ static void instant_metadata_lock(dict_index_t& index, mtr_t& mtr) } /** Initialize instant->field_map. -@tparam replace_dropped whether to point clustered index fields -to instant->dropped[] @param[in] table table definition to copy from */ -template<bool replace_dropped> inline void dict_table_t::init_instant(const dict_table_t& table) { const dict_index_t& oindex __attribute__((unused))= *table.indexes.start; @@ -209,12 +206,10 @@ inline void dict_table_t::init_instant(const dict_table_t& table) ut_ad(f.col < table.instant->dropped + table.instant->n_dropped); ut_d(n_drop++); - if (replace_dropped) { - size_t d = f.col - table.instant->dropped; - ut_ad(f.col == &table.instant->dropped[d]); - ut_ad(d <= instant->n_dropped); - f.col = &instant->dropped[d]; - } + size_t d = f.col - table.instant->dropped; + ut_ad(f.col == &table.instant->dropped[d]); + ut_ad(d <= instant->n_dropped); + f.col = &instant->dropped[d]; } ut_ad(n_drop == n_dropped()); ut_ad(field_map_it == &instant->field_map[index.n_fields - u]); @@ -655,7 +650,7 @@ dup_dropped: const field_map_element_t* field_map = old_instant ? old_instant->field_map : NULL; - init_instant<true>(table); + init_instant(table); if (!metadata_changed) { metadata_changed = !field_map diff --git a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h index 1f419061b8a..a630eb17c93 100644 --- a/storage/innobase/include/dict0mem.h +++ b/storage/innobase/include/dict0mem.h @@ -1886,10 +1886,7 @@ struct dict_table_t { private: /** Initialize instant->field_map. - @tparam replace_dropped whether to point clustered index fields - to instant->dropped[] @param[in] table table definition to copy from */ - template<bool replace_dropped = false> inline void init_instant(const dict_table_t& table); public: /** Id of the table. */ |