mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
fix gcc 8 compiler warnings
There were two newly enabled warnings: 1. cast for a function pointers. Affected sql_analyse.h, mi_write.c and ma_write.cc, mf_iocache-t.cc, mysqlbinlog.cc, encryption.cc, etc 2. memcpy/memset of nontrivial structures. Fixed as: * the warning disabled for InnoDB * TABLE, TABLE_SHARE, and TABLE_LIST got a new method reset() which does the bzero(), which is safe for these classes, but any other bzero() will still cause a warning * Table_scope_and_contents_source_st uses `TABLE_LIST *` (trivial) instead of `SQL_I_List<TABLE_LIST>` (not trivial) so it's safe to bzero now. * added casts in debug_sync.cc and sql_select.cc (for JOIN) * move assignment method for MDL_request instead of memcpy() * PARTIAL_INDEX_INTERSECT_INFO::init() instead of bzero() * remove constructor from READ_RECORD() to make it trivial * replace some memcpy() with c++ copy assignments
This commit is contained in:
@@ -2867,16 +2867,25 @@ void *sql_alloc(size_t size)
|
||||
return alloc_root(&s_mem_root, size);
|
||||
}
|
||||
|
||||
uint e_key_get_latest_version_func(uint) { return 1; }
|
||||
uint e_key_get_func(uint, uint, uchar*, uint*) { return 1; }
|
||||
uint e_ctx_size_func(uint, uint) { return 1; }
|
||||
int e_ctx_init_func(void *, const uchar*, uint, const uchar*, uint,
|
||||
int, uint, uint) { return 1; }
|
||||
int e_ctx_update_func(void *, const uchar*, uint, uchar*, uint*) { return 1; }
|
||||
int e_ctx_finish_func(void *, uchar*, uint*) { return 1; }
|
||||
uint e_encrypted_length_func(uint, uint, uint) { return 1; }
|
||||
|
||||
uint dummy1() { return 1; }
|
||||
struct encryption_service_st encryption_handler=
|
||||
{
|
||||
(uint(*)(uint))dummy1,
|
||||
(uint(*)(uint, uint, uchar*, uint*))dummy1,
|
||||
(uint(*)(uint, uint))dummy1,
|
||||
(int (*)(void*, const uchar*, uint, const uchar*, uint, int, uint, uint))dummy1,
|
||||
(int (*)(void*, const uchar*, uint, uchar*, uint*))dummy1,
|
||||
(int (*)(void*, uchar*, uint*))dummy1,
|
||||
(uint (*)(uint, uint, uint))dummy1
|
||||
e_key_get_latest_version_func,
|
||||
e_key_get_func,
|
||||
e_ctx_size_func,
|
||||
e_ctx_init_func,
|
||||
e_ctx_update_func,
|
||||
e_ctx_finish_func,
|
||||
e_encrypted_length_func
|
||||
};
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user