mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Fixed wrong arguments to printf and related functions
Other things, mainly to get create_mysqld_error_find_printf_error tool to work: - Added protection to not include mysqld_error.h twice - Include "unireg.h" instead of "mysqld_error.h" in server - Added protection if ER_XX messages are already defined - Removed wrong calls to my_error(ER_OUTOFMEMORY) as my_malloc() and my_alloc will do this automatically - Added missing %s to ER_DUP_QUERY_NAME - Removed old and wrong calls to my_strerror() when using MY_ERROR_ON_RENAME (wrong merge) - Fixed deadlock error message from Galera. Before the extra information given to ER_LOCK_DEADLOCK was missing because ER_LOCK_DEADLOCK doesn't provide any extra information. I kept #ifdef mysqld_error_find_printf_error_used in sql_acl.h to make it easy to do this kind of check again in the future
This commit is contained in:
@@ -1927,10 +1927,7 @@ slave_connection_state::load(char *slave_request, size_t len)
|
||||
for (;;)
|
||||
{
|
||||
if (!(rec= (uchar *)my_malloc(sizeof(entry), MYF(MY_WME))))
|
||||
{
|
||||
my_error(ER_OUTOFMEMORY, MYF(0), sizeof(*gtid));
|
||||
return 1;
|
||||
}
|
||||
gtid= &((entry *)rec)->gtid;
|
||||
if (gtid_parser_helper(&p, end, gtid))
|
||||
{
|
||||
@@ -2547,10 +2544,7 @@ gtid_waiting::get_entry(uint32 domain_id)
|
||||
return e;
|
||||
|
||||
if (!(e= (hash_element *)my_malloc(sizeof(*e), MYF(MY_WME))))
|
||||
{
|
||||
my_error(ER_OUTOFMEMORY, MYF(0), sizeof(*e));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (init_queue(&e->queue, 8, offsetof(queue_element, wait_seq_no), 0,
|
||||
cmp_queue_elem, NULL, 1+offsetof(queue_element, queue_idx), 1))
|
||||
|
Reference in New Issue
Block a user