diff options
| -rw-r--r-- | server-tools/instance-manager/parse.h | 2 | ||||
| -rw-r--r-- | sql/log_event.cc | 2 | ||||
| -rw-r--r-- | sql/rpl_filter.cc | 2 | ||||
| -rw-r--r-- | sql/rpl_filter.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/server-tools/instance-manager/parse.h b/server-tools/instance-manager/parse.h index ae29c7eb64a..fd970f54d29 100644 --- a/server-tools/instance-manager/parse.h +++ b/server-tools/instance-manager/parse.h @@ -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) diff --git a/sql/log_event.cc b/sql/log_event.cc index 7a4f22a4064..823fad1e8e2 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -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; diff --git a/sql/rpl_filter.cc b/sql/rpl_filter.cc index 143cd027b5f..c01b5189887 100644 --- a/sql/rpl_filter.cc +++ b/sql/rpl_filter.cc @@ -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; diff --git a/sql/rpl_filter.h b/sql/rpl_filter.h index 58d2b97c9c6..718fd401c56 100644 --- a/sql/rpl_filter.h +++ b/sql/rpl_filter.h @@ -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(); |