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:
@@ -18,7 +18,6 @@
|
||||
|
||||
#include <my_global.h>
|
||||
#include "sql_priv.h"
|
||||
#include "mysqld_error.h"
|
||||
|
||||
#ifndef MYSQL_CLIENT
|
||||
#include "unireg.h"
|
||||
@@ -44,6 +43,8 @@
|
||||
#include <strfunc.h>
|
||||
#include "compat56.h"
|
||||
#include "wsrep_mysqld.h"
|
||||
#else
|
||||
#include "mysqld_error.h"
|
||||
#endif /* MYSQL_CLIENT */
|
||||
|
||||
#include <my_bitmap.h>
|
||||
@@ -1914,9 +1915,9 @@ err:
|
||||
#endif
|
||||
if (event.length() >= OLD_HEADER_LEN)
|
||||
sql_print_error("Error in Log_event::read_log_event(): '%s',"
|
||||
" data_len: %lu, event_type: %d", error,
|
||||
uint4korr(&event[EVENT_LEN_OFFSET]),
|
||||
(uchar)event[EVENT_TYPE_OFFSET]);
|
||||
" data_len: %lu, event_type: %u", error,
|
||||
(ulong) uint4korr(&event[EVENT_LEN_OFFSET]),
|
||||
(uint) (uchar)event[EVENT_TYPE_OFFSET]);
|
||||
else
|
||||
sql_print_error("Error in Log_event::read_log_event(): '%s'", error);
|
||||
/*
|
||||
|
Reference in New Issue
Block a user