mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 09:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-26637: (explicit length) ASAN: main.metadata and user_variables.basic MTR failures after MDEV-26572

Browse source 
Use explicit length for hash record length
This commit is contained in:
Oleksandr Byelkin 2021-09-30 10:14:28 +02:00
parent 6cf7d6a093
commit 763bdee81b
6 changed files with 66 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mysys/thr_mutex.c
View file

@ -332,7 +332,8 @@ int safe_mutex_lock(safe_mutex_t *mp, myf my_flags, const char *file,
*/ */
pthread_mutex_lock(&THR_LOCK_mutex); pthread_mutex_lock(&THR_LOCK_mutex);
if (!my_hash_search(mutex_root->locked_mutex, (uchar*) &mp->id, 0)) if (!my_hash_search(mutex_root->locked_mutex, (uchar*) &mp->id,
sizeof(mp->id)))
{ {
safe_mutex_deadlock_t *deadlock; safe_mutex_deadlock_t *deadlock;
safe_mutex_t *mutex; safe_mutex_t *mutex;
@ -352,7 +353,8 @@ int safe_mutex_lock(safe_mutex_t *mp, myf my_flags, const char *file,
mutex= mutex_root; mutex= mutex_root;
do do
{ {
if (my_hash_search(mp->locked_mutex, (uchar*) &mutex->id, 0)) if (my_hash_search(mp->locked_mutex, (uchar*) &mutex->id,
sizeof(mutex->id)))
{ {
print_deadlock_warning(mp, mutex); print_deadlock_warning(mp, mutex);
/* Mark wrong usage to avoid future warnings for same error */ /* Mark wrong usage to avoid future warnings for same error */
@ -772,7 +774,8 @@ static my_bool remove_from_locked_mutex(safe_mutex_t *mp,
delete_mutex->id, mp->id)); delete_mutex->id, mp->id));
found= (safe_mutex_deadlock_t *) my_hash_search(mp->locked_mutex, found= (safe_mutex_deadlock_t *) my_hash_search(mp->locked_mutex,
(uchar*) &delete_mutex->id, 0); (uchar*) &delete_mutex->id,
sizeof(delete_mutex->id));
DBUG_ASSERT(found); DBUG_ASSERT(found);
if (found) if (found)
{ {

2
sql/hostname.cc
View file

@ -191,7 +191,7 @@ Host_entry *hostname_cache_first()
static inline Host_entry *hostname_cache_search(const char *ip_key) static inline Host_entry *hostname_cache_search(const char *ip_key)
{ {
return hostname_cache->search((uchar *) ip_key, 0); return hostname_cache->search((uchar *) ip_key, HOST_ENTRY_KEY_SIZE);
} }
static void add_hostname_impl(const char *ip_key, const char *hostname, static void add_hostname_impl(const char *ip_key, const char *hostname,

84
sql/rpl_gtid.cc
View file

@ -249,8 +249,9 @@ rpl_slave_state::rpl_slave_state()
{ {
mysql_mutex_init(key_LOCK_slave_state, &LOCK_slave_state, mysql_mutex_init(key_LOCK_slave_state, &LOCK_slave_state,
MY_MUTEX_INIT_SLOW); MY_MUTEX_INIT_SLOW);
my_hash_init(PSI_INSTRUMENT_ME, &hash, &my_charset_bin, 32, offsetof(element, domain_id), my_hash_init(PSI_INSTRUMENT_ME, &hash, &my_charset_bin, 32,
sizeof(uint32), NULL, rpl_slave_state_free_element, HASH_UNIQUE); offsetof(element, domain_id), sizeof(element::domain_id),
NULL, rpl_slave_state_free_element, HASH_UNIQUE);
my_init_dynamic_array(PSI_INSTRUMENT_ME, &gtid_sort_array, sizeof(rpl_gtid), my_init_dynamic_array(PSI_INSTRUMENT_ME, &gtid_sort_array, sizeof(rpl_gtid),
8, 8, MYF(0)); 8, 8, MYF(0));
} }
@ -366,7 +367,8 @@ rpl_slave_state::get_element(uint32 domain_id)
{ {
struct element *elem; struct element *elem;
elem= (element *)my_hash_search(&hash, (const uchar *)&domain_id, 0); elem= (element *)my_hash_search(&hash, (const uchar *)&domain_id,
sizeof(domain_id));
if (elem) if (elem)
return elem; return elem;
@ -402,7 +404,8 @@ rpl_slave_state::put_back_list(list_element *list)
list_element *next= list->next; list_element *next= list->next;
if ((!e || e->domain_id != list->domain_id) && if ((!e || e->domain_id != list->domain_id) &&
!(e= (element *)my_hash_search(&hash, (const uchar *)&list->domain_id, 0))) !(e= (element *)my_hash_search(&hash, (const uchar *)&list->domain_id,
sizeof(list->domain_id))))
{ {
err= 1; err= 1;
goto end; goto end;
@ -1107,8 +1110,8 @@ rpl_slave_state::iterate(int (*cb)(rpl_gtid *, void *), void *data,
bool locked= false; bool locked= false;
my_hash_init(PSI_INSTRUMENT_ME, &gtid_hash, &my_charset_bin, 32, my_hash_init(PSI_INSTRUMENT_ME, &gtid_hash, &my_charset_bin, 32,
offsetof(rpl_gtid, domain_id), sizeof(uint32), NULL, NULL, offsetof(rpl_gtid, domain_id), sizeof(rpl_gtid::domain_id),
HASH_UNIQUE); NULL, NULL, HASH_UNIQUE);
for (i= 0; i < num_extra; ++i) for (i= 0; i < num_extra; ++i)
if (extra_gtids[i].server_id == global_system_variables.server_id && if (extra_gtids[i].server_id == global_system_variables.server_id &&
my_hash_insert(&gtid_hash, (uchar *)(&extra_gtids[i]))) my_hash_insert(&gtid_hash, (uchar *)(&extra_gtids[i])))
@ -1143,7 +1146,8 @@ rpl_slave_state::iterate(int (*cb)(rpl_gtid *, void *), void *data,
} }
/* Check if we have something newer in the extra list. */ /* Check if we have something newer in the extra list. */
rec= my_hash_search(&gtid_hash, (const uchar *)&best_gtid.domain_id, 0); rec= my_hash_search(&gtid_hash, (const uchar *)&best_gtid.domain_id,
sizeof(best_gtid.domain_id));
if (rec) if (rec)
{ {
gtid= (rpl_gtid *)rec; gtid= (rpl_gtid *)rec;
@ -1243,7 +1247,8 @@ rpl_slave_state::domain_to_gtid(uint32 domain_id, rpl_gtid *out_gtid)
uint64 best_sub_id; uint64 best_sub_id;
mysql_mutex_lock(&LOCK_slave_state); mysql_mutex_lock(&LOCK_slave_state);
elem= (element *)my_hash_search(&hash, (const uchar *)&domain_id, 0); elem= (element *)my_hash_search(&hash, (const uchar *)&domain_id,
sizeof(domain_id));
if (!elem || !(list= elem->list)) if (!elem || !(list= elem->list))
{ {
mysql_mutex_unlock(&LOCK_slave_state); mysql_mutex_unlock(&LOCK_slave_state);
@ -1477,8 +1482,9 @@ rpl_slave_state::alloc_gtid_pos_table(LEX_CSTRING *table_name, void *hton,
void rpl_binlog_state::init() void rpl_binlog_state::init()
{ {
my_hash_init(PSI_INSTRUMENT_ME, &hash, &my_charset_bin, 32, offsetof(element, domain_id), my_hash_init(PSI_INSTRUMENT_ME, &hash, &my_charset_bin, 32,
sizeof(uint32), NULL, my_free, HASH_UNIQUE); offsetof(element, domain_id), sizeof(element::domain_id),
NULL, my_free, HASH_UNIQUE);
my_init_dynamic_array(PSI_INSTRUMENT_ME, &gtid_sort_array, sizeof(rpl_gtid), 8, 8, MYF(0)); my_init_dynamic_array(PSI_INSTRUMENT_ME, &gtid_sort_array, sizeof(rpl_gtid), 8, 8, MYF(0));
mysql_mutex_init(key_LOCK_binlog_state, &LOCK_binlog_state, mysql_mutex_init(key_LOCK_binlog_state, &LOCK_binlog_state,
MY_MUTEX_INIT_SLOW); MY_MUTEX_INIT_SLOW);
@ -1580,7 +1586,8 @@ rpl_binlog_state::update_nolock(const struct rpl_gtid *gtid, bool strict)
element *elem; element *elem;
if ((elem= (element *)my_hash_search(&hash, if ((elem= (element *)my_hash_search(&hash,
(const uchar *)(&gtid->domain_id), 0))) (const uchar *)(&gtid->domain_id),
sizeof(gtid->domain_id))))
{ {
if (strict && elem->last_gtid && elem->last_gtid->seq_no >= gtid->seq_no) if (strict && elem->last_gtid && elem->last_gtid->seq_no >= gtid->seq_no)
{ {
@ -1628,7 +1635,8 @@ rpl_binlog_state::update_with_next_gtid(uint32 domain_id, uint32 server_id,
gtid->server_id= server_id; gtid->server_id= server_id;
mysql_mutex_lock(&LOCK_binlog_state); mysql_mutex_lock(&LOCK_binlog_state);
if ((elem= (element *)my_hash_search(&hash, (const uchar *)(&domain_id), 0))) if ((elem= (element *)my_hash_search(&hash, (const uchar *)(&domain_id),
sizeof(domain_id))))
{ {
gtid->seq_no= ++elem->seq_no_counter; gtid->seq_no= ++elem->seq_no_counter;
if (!elem->update_element(gtid)) if (!elem->update_element(gtid))
@ -1667,7 +1675,8 @@ rpl_binlog_state::element::update_element(const rpl_gtid *gtid)
} }
lookup_gtid= (rpl_gtid *) lookup_gtid= (rpl_gtid *)
my_hash_search(&hash, (const uchar *)&gtid->server_id, 0); my_hash_search(&hash, (const uchar *)&gtid->server_id,
sizeof(gtid->server_id));
if (lookup_gtid) if (lookup_gtid)
{ {
lookup_gtid->seq_no= gtid->seq_no; lookup_gtid->seq_no= gtid->seq_no;
@ -1705,8 +1714,8 @@ rpl_binlog_state::alloc_element_nolock(const rpl_gtid *gtid)
{ {
elem->domain_id= gtid->domain_id; elem->domain_id= gtid->domain_id;
my_hash_init(PSI_INSTRUMENT_ME, &elem->hash, &my_charset_bin, 32, my_hash_init(PSI_INSTRUMENT_ME, &elem->hash, &my_charset_bin, 32,
offsetof(rpl_gtid, server_id), sizeof(uint32), NULL, my_free, offsetof(rpl_gtid, server_id), sizeof(rpl_gtid::domain_id),
HASH_UNIQUE); NULL, my_free, HASH_UNIQUE);
elem->last_gtid= lookup_gtid; elem->last_gtid= lookup_gtid;
elem->seq_no_counter= gtid->seq_no; elem->seq_no_counter= gtid->seq_no;
memcpy(lookup_gtid, gtid, sizeof(*lookup_gtid)); memcpy(lookup_gtid, gtid, sizeof(*lookup_gtid));
@ -1741,7 +1750,8 @@ rpl_binlog_state::check_strict_sequence(uint32 domain_id, uint32 server_id,
mysql_mutex_lock(&LOCK_binlog_state); mysql_mutex_lock(&LOCK_binlog_state);
if ((elem= (element *)my_hash_search(&hash, if ((elem= (element *)my_hash_search(&hash,
(const uchar *)(&domain_id), 0)) && (const uchar *)(&domain_id),
sizeof(domain_id))) &&
elem->last_gtid && elem->last_gtid->seq_no >= seq_no) elem->last_gtid && elem->last_gtid->seq_no >= seq_no)
{ {
my_error(ER_GTID_STRICT_OUT_OF_ORDER, MYF(0), domain_id, server_id, seq_no, my_error(ER_GTID_STRICT_OUT_OF_ORDER, MYF(0), domain_id, server_id, seq_no,
@ -1768,7 +1778,8 @@ rpl_binlog_state::bump_seq_no_if_needed(uint32 domain_id, uint64 seq_no)
int res; int res;
mysql_mutex_lock(&LOCK_binlog_state); mysql_mutex_lock(&LOCK_binlog_state);
if ((elem= (element *)my_hash_search(&hash, (const uchar *)(&domain_id), 0))) if ((elem= (element *)my_hash_search(&hash, (const uchar *)(&domain_id),
sizeof(domain_id))))
{ {
if (elem->seq_no_counter < seq_no) if (elem->seq_no_counter < seq_no)
elem->seq_no_counter= seq_no; elem->seq_no_counter= seq_no;
@ -1786,8 +1797,8 @@ rpl_binlog_state::bump_seq_no_if_needed(uint32 domain_id, uint64 seq_no)
elem->domain_id= domain_id; elem->domain_id= domain_id;
my_hash_init(PSI_INSTRUMENT_ME, &elem->hash, &my_charset_bin, 32, my_hash_init(PSI_INSTRUMENT_ME, &elem->hash, &my_charset_bin, 32,
offsetof(rpl_gtid, server_id), sizeof(uint32), NULL, my_free, offsetof(rpl_gtid, server_id), sizeof(rpl_gtid::server_id),
HASH_UNIQUE); NULL, my_free, HASH_UNIQUE);
elem->last_gtid= NULL; elem->last_gtid= NULL;
elem->seq_no_counter= seq_no; elem->seq_no_counter= seq_no;
if (0 == my_hash_insert(&hash, (const uchar *)elem)) if (0 == my_hash_insert(&hash, (const uchar *)elem))
@ -1891,9 +1902,11 @@ rpl_gtid *
rpl_binlog_state::find_nolock(uint32 domain_id, uint32 server_id) rpl_binlog_state::find_nolock(uint32 domain_id, uint32 server_id)
{ {
element *elem; element *elem;
if (!(elem= (element *)my_hash_search(&hash, (const uchar *)&domain_id, 0))) if (!(elem= (element *)my_hash_search(&hash, (const uchar *)&domain_id,
sizeof(domain_id))))
return NULL; return NULL;
return (rpl_gtid *)my_hash_search(&elem->hash, (const uchar *)&server_id, 0); return (rpl_gtid *)my_hash_search(&elem->hash, (const uchar *)&server_id,
sizeof(server_id));
} }
rpl_gtid * rpl_gtid *
@ -1913,7 +1926,8 @@ rpl_binlog_state::find_most_recent(uint32 domain_id)
rpl_gtid *gtid= NULL; rpl_gtid *gtid= NULL;
mysql_mutex_lock(&LOCK_binlog_state); mysql_mutex_lock(&LOCK_binlog_state);
elem= (element *)my_hash_search(&hash, (const uchar *)&domain_id, 0); elem= (element *)my_hash_search(&hash, (const uchar *)&domain_id,
sizeof(domain_id));
if (elem && elem->last_gtid) if (elem && elem->last_gtid)
gtid= elem->last_gtid; gtid= elem->last_gtid;
mysql_mutex_unlock(&LOCK_binlog_state); mysql_mutex_unlock(&LOCK_binlog_state);
@ -2182,7 +2196,8 @@ rpl_binlog_state::drop_domain(DYNAMIC_ARRAY *ids,
ptr_domain_id= (uint32*) dynamic_array_ptr(ids, i); ptr_domain_id= (uint32*) dynamic_array_ptr(ids, i);
elem= (rpl_binlog_state::element *) elem= (rpl_binlog_state::element *)
my_hash_search(&hash, (const uchar *) ptr_domain_id, 0); my_hash_search(&hash, (const uchar *) ptr_domain_id,
sizeof(ptr_domain_id[0]));
if (!elem) if (!elem)
{ {
push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN, push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN,
@ -2243,7 +2258,7 @@ slave_connection_state::slave_connection_state()
{ {
my_hash_init(PSI_INSTRUMENT_ME, &hash, &my_charset_bin, 32, my_hash_init(PSI_INSTRUMENT_ME, &hash, &my_charset_bin, 32,
offsetof(entry, gtid) + offsetof(rpl_gtid, domain_id), offsetof(entry, gtid) + offsetof(rpl_gtid, domain_id),
sizeof(uint32), NULL, my_free, HASH_UNIQUE); sizeof(rpl_gtid::domain_id), NULL, my_free, HASH_UNIQUE);
my_init_dynamic_array(PSI_INSTRUMENT_ME, &gtid_sort_array, sizeof(rpl_gtid), 8, 8, MYF(0)); my_init_dynamic_array(PSI_INSTRUMENT_ME, &gtid_sort_array, sizeof(rpl_gtid), 8, 8, MYF(0));
} }
@ -2298,7 +2313,8 @@ slave_connection_state::load(const char *slave_request, size_t len)
return 1; return 1;
} }
if ((e= (const entry *) if ((e= (const entry *)
my_hash_search(&hash, (const uchar *)(&gtid->domain_id), 0))) my_hash_search(&hash, (const uchar *)(&gtid->domain_id),
sizeof(gtid->domain_id))))
{ {
my_error(ER_DUPLICATE_GTID_DOMAIN, MYF(0), gtid->domain_id, my_error(ER_DUPLICATE_GTID_DOMAIN, MYF(0), gtid->domain_id,
gtid->server_id, (ulonglong)gtid->seq_no, e->gtid.domain_id, gtid->server_id, (ulonglong)gtid->seq_no, e->gtid.domain_id,
@ -2365,7 +2381,8 @@ slave_connection_state::load(rpl_slave_state *state,
slave_connection_state::entry * slave_connection_state::entry *
slave_connection_state::find_entry(uint32 domain_id) slave_connection_state::find_entry(uint32 domain_id)
{ {
return (entry *) my_hash_search(&hash, (const uchar *)(&domain_id), 0); return (entry *) my_hash_search(&hash, (const uchar *)(&domain_id),
sizeof(domain_id));
} }
@ -2383,7 +2400,8 @@ int
slave_connection_state::update(const rpl_gtid *in_gtid) slave_connection_state::update(const rpl_gtid *in_gtid)
{ {
entry *e; entry *e;
uchar *rec= my_hash_search(&hash, (const uchar *)(&in_gtid->domain_id), 0); uchar *rec= my_hash_search(&hash, (const uchar *)(&in_gtid->domain_id),
sizeof(in_gtid->domain_id));
if (rec) if (rec)
{ {
e= (entry *)rec; e= (entry *)rec;
@ -2408,7 +2426,8 @@ slave_connection_state::update(const rpl_gtid *in_gtid)
void void
slave_connection_state::remove(const rpl_gtid *in_gtid) slave_connection_state::remove(const rpl_gtid *in_gtid)
{ {
uchar *rec= my_hash_search(&hash, (const uchar *)(&in_gtid->domain_id), 0); uchar *rec= my_hash_search(&hash, (const uchar *)(&in_gtid->domain_id),
sizeof(in_gtid->domain_id));
#ifdef DBUG_ASSERT_EXISTS #ifdef DBUG_ASSERT_EXISTS
bool err; bool err;
rpl_gtid *slave_gtid= &((entry *)rec)->gtid; rpl_gtid *slave_gtid= &((entry *)rec)->gtid;
@ -2425,7 +2444,8 @@ slave_connection_state::remove(const rpl_gtid *in_gtid)
void void
slave_connection_state::remove_if_present(const rpl_gtid *in_gtid) slave_connection_state::remove_if_present(const rpl_gtid *in_gtid)
{ {
uchar *rec= my_hash_search(&hash, (const uchar *)(&in_gtid->domain_id), 0); uchar *rec= my_hash_search(&hash, (const uchar *)(&in_gtid->domain_id),
sizeof(in_gtid->domain_id));
if (rec) if (rec)
my_hash_delete(&hash, rec); my_hash_delete(&hash, rec);
} }
@ -2869,7 +2889,8 @@ void
gtid_waiting::init() gtid_waiting::init()
{ {
my_hash_init(PSI_INSTRUMENT_ME, &hash, &my_charset_bin, 32, my_hash_init(PSI_INSTRUMENT_ME, &hash, &my_charset_bin, 32,
offsetof(hash_element, domain_id), sizeof(uint32), NULL, offsetof(hash_element, domain_id),
sizeof(hash_element::domain_id), NULL,
free_hash_element, HASH_UNIQUE); free_hash_element, HASH_UNIQUE);
mysql_mutex_init(key_LOCK_gtid_waiting, &LOCK_gtid_waiting, 0); mysql_mutex_init(key_LOCK_gtid_waiting, &LOCK_gtid_waiting, 0);
} }
@ -2902,7 +2923,8 @@ gtid_waiting::get_entry(uint32 domain_id)
{ {
hash_element *e; hash_element *e;
if ((e= (hash_element *)my_hash_search(&hash, (const uchar *)&domain_id, 0))) if ((e= (hash_element *)my_hash_search(&hash, (const uchar *)&domain_id,
sizeof(domain_id))))
return e; return e;
if (!(e= (hash_element *)my_malloc(PSI_INSTRUMENT_ME, sizeof(*e), MYF(MY_WME)))) if (!(e= (hash_element *)my_malloc(PSI_INSTRUMENT_ME, sizeof(*e), MYF(MY_WME))))

3
sql/rpl_parallel.cc
View file

@ -2347,7 +2347,8 @@ rpl_parallel::find(uint32 domain_id)
struct rpl_parallel_entry *e; struct rpl_parallel_entry *e;
if (!(e= (rpl_parallel_entry *)my_hash_search(&domain_hash, if (!(e= (rpl_parallel_entry *)my_hash_search(&domain_hash,
(const uchar *)&domain_id, 0))) (const uchar *)&domain_id,
sizeof(domain_id))))
{ {
/* Allocate a new, empty one. */ /* Allocate a new, empty one. */
ulong count= opt_slave_domain_parallel_threads; ulong count= opt_slave_domain_parallel_threads;

3
sql/rpl_rli.cc
View file

@ -1632,7 +1632,8 @@ scan_one_gtid_slave_pos_table(THD *thd, HASH *hash, DYNAMIC_ARRAY *array,
goto end; goto end;
} }
if ((rec= my_hash_search(hash, (const uchar *)&domain_id, 0))) if ((rec= my_hash_search(hash, (const uchar *)&domain_id,
sizeof(domain_id))))
{ {
entry= (struct gtid_pos_element *)rec; entry= (struct gtid_pos_element *)rec;
if (entry->sub_id >= sub_id) if (entry->sub_id >= sub_id)

3
storage/maria/ma_open.c
View file

@ -1025,7 +1025,8 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags,
MARIA_STATE_HISTORY_CLOSED *history; MARIA_STATE_HISTORY_CLOSED *history;
if ((history= (MARIA_STATE_HISTORY_CLOSED *) if ((history= (MARIA_STATE_HISTORY_CLOSED *)
my_hash_search(&maria_stored_state, my_hash_search(&maria_stored_state,
(uchar*) &share->state.create_rename_lsn, 0))) (uchar*) &share->state.create_rename_lsn,
sizeof(share->state.create_rename_lsn))))
{ {
/* /*
Move history from hash to share. This is safe to do as we Move history from hash to share. This is safe to do as we