mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 11:57:38 +02:00
- Fix MDEV-6802 in a clean way.
Add an union in the PARM structure to contain int values Use a cast to ptrdiff_t in MAPFAM/MXPFAM::InitDelete required by some compilers modified: storage/connect/array.cpp storage/connect/filamap.cpp storage/connect/filamtxt.cpp storage/connect/global.h - Suppress some GCC warnings modified: storage/connect/array.cpp storage/connect/filter.cpp storage/connect/tabdos.cpp storage/connect/tabmysql.cpp storage/connect/value.cpp
This commit is contained in:
parent
dd5eb7ae67
commit
38c3fd2099
8 changed files with 48 additions and 45 deletions
|
|
@ -205,7 +205,10 @@ typedef struct _activity { /* Describes activity and language */
|
|||
|
||||
/*---------------- UNIT ?????????? VERSION ? ----------------------*/
|
||||
typedef struct _parm {
|
||||
void *Value;
|
||||
union {
|
||||
void *Value;
|
||||
int Intval;
|
||||
}; // end union
|
||||
short Type, Domain;
|
||||
PPARM Next;
|
||||
} PARM;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue