mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Fixes for Windows compilation failures.
server-tools/instance-manager/parse.h: Post-merge fixes: fix Windows build. sql/log_event.cc: uint32 -> uint sql/rpl_filter.cc: uint32 -> uint sql/rpl_filter.h: uint32 -> uint
This commit is contained in:
@ -69,7 +69,7 @@ private:
|
||||
|
||||
inline char *Named_value::alloc_str(const LEX_STRING *str)
|
||||
{
|
||||
return my_strndup((const byte *) str->str, str->length, MYF(0));
|
||||
return my_strndup(str->str, str->length, MYF(0));
|
||||
}
|
||||
|
||||
inline char *Named_value::alloc_str(const char *str)
|
||||
|
@ -5839,7 +5839,7 @@ int Table_map_log_event::exec_event(st_relay_log_info *rli)
|
||||
if (memory == NULL)
|
||||
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
|
||||
|
||||
uint32 dummy_len;
|
||||
uint dummy_len;
|
||||
bzero(table_list, sizeof(*table_list));
|
||||
table_list->db = db_mem;
|
||||
table_list->alias= table_list->table_name = tname_mem;
|
||||
|
@ -513,7 +513,7 @@ Rpl_filter::get_wild_ignore_table(String* str)
|
||||
|
||||
|
||||
const char*
|
||||
Rpl_filter::get_rewrite_db(const char* db, uint32 *new_len)
|
||||
Rpl_filter::get_rewrite_db(const char* db, uint *new_len)
|
||||
{
|
||||
if (rewrite_db.is_empty() || !db)
|
||||
return db;
|
||||
|
@ -70,7 +70,7 @@ public:
|
||||
void get_wild_do_table(String* str);
|
||||
void get_wild_ignore_table(String* str);
|
||||
|
||||
const char* get_rewrite_db(const char* db, uint32 *new_len);
|
||||
const char* get_rewrite_db(const char* db, uint *new_len);
|
||||
|
||||
I_List<i_string>* get_do_db();
|
||||
I_List<i_string>* get_ignore_db();
|
||||
|
Reference in New Issue
Block a user