Commit 0d4df3cd authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Merge branch '10.3' into bb-10.3-cc

# Conflicts:
#	libmariadb
parents 4cc7f965 7bf4a006
Subproject commit cbc9a71e1d2aff81119c912e6a8dbf5e544b58eb Subproject commit 252a7c36ef885b5128761a82f9e183621a3e525f
...@@ -1780,7 +1780,8 @@ gtid_pos_auto_create_tables(rpl_slave_state::gtid_pos_table **list_ptr) ...@@ -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)); p= strmake(p, plugin_name(*auto_engines)->str, FN_REFLEN - (p - buf));
table_name.str= buf; table_name.str= buf;
table_name.length= p - 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 entry= rpl_global_gtid_slave_state->alloc_gtid_pos_table
(&table_name, hton, rpl_slave_state::GTID_POS_AUTO_CREATE); (&table_name, hton, rpl_slave_state::GTID_POS_AUTO_CREATE);
if (!entry) if (!entry)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment