diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-05-19 15:44:31 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-05-19 15:44:31 +0000 |
| commit | 0d4df3cd13535a939cf9f66141a9597dcab120f6 (patch) | |
| tree | 8e174eca2f458033268b7dda118d4de06182c4c5 | |
| parent | 4cc7f96512201ea87a56e31606b2606b711cb03b (diff) | |
| parent | 7bf4a006b3ecf669fc39c14064f2062170ff1a10 (diff) | |
| download | mariadb-git-0d4df3cd13535a939cf9f66141a9597dcab120f6.tar.gz | |
Merge branch '10.3' into bb-10.3-cc
# Conflicts:
# libmariadb
| m--------- | libmariadb | 0 | ||||
| -rw-r--r-- | sql/rpl_rli.cc | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libmariadb b/libmariadb -Subproject cbc9a71e1d2aff81119c912e6a8dbf5e544b58e +Subproject 252a7c36ef885b5128761a82f9e183621a3e525 diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 05dffe2c462..9e09a5cf067 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -1780,7 +1780,8 @@ gtid_pos_auto_create_tables(rpl_slave_state::gtid_pos_table **list_ptr) p= strmake(p, plugin_name(*auto_engines)->str, FN_REFLEN - (p - buf)); table_name.str= buf; table_name.length= p - buf; - table_case_convert(const_cast<char*>(table_name.str), table_name.length); + table_case_convert(const_cast<char*>(table_name.str), + static_cast<uint>(table_name.length)); entry= rpl_global_gtid_slave_state->alloc_gtid_pos_table (&table_name, hton, rpl_slave_state::GTID_POS_AUTO_CREATE); if (!entry) |