mirror of
https://github.com/MariaDB/server.git
synced 2025-07-24 19:42:23 +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:
@ -10241,8 +10241,8 @@ void SEL_ARG::test_use_count(SEL_ARG *root)
|
||||
ulong count=count_key_part_usage(root,pos->next_key_part);
|
||||
if (count > pos->next_key_part->use_count)
|
||||
{
|
||||
sql_print_information("Use_count: Wrong count for key at %p, %lu "
|
||||
"should be %lu", (long unsigned int)pos,
|
||||
sql_print_information("Use_count: Wrong count for key at %p: %lu "
|
||||
"should be %lu", pos,
|
||||
pos->next_key_part->use_count, count);
|
||||
return;
|
||||
}
|
||||
@ -10251,7 +10251,7 @@ void SEL_ARG::test_use_count(SEL_ARG *root)
|
||||
}
|
||||
if (e_count != elements)
|
||||
sql_print_warning("Wrong use count: %u (should be %u) for tree at %p",
|
||||
e_count, elements, (long unsigned int) this);
|
||||
e_count, elements, this);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user