mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
compilation errors on sparc sun studio 10
1. unused static inline functions are only removed at -xO4, otherwise test binaries will depend on various mysys symbols that they don't use. Link test with libmysys. 2. Sphinx - don't instantiate (explicitly) templates before they're defined. Or, rather, don't instantiate them explicitly at all. 3. GIS - don't use anonymous unions and structs.
This commit is contained in:
@ -1243,7 +1243,7 @@ inline int Gcalc_operation_reducer::get_single_result(res_point *res,
|
||||
GCALC_DBUG_RETURN(1);
|
||||
}
|
||||
else
|
||||
if (storage->single_point(res->pi->x, res->pi->y))
|
||||
if (storage->single_point(res->pi->node.shape.x, res->pi->node.shape.y))
|
||||
GCALC_DBUG_RETURN(1);
|
||||
free_result(res);
|
||||
GCALC_DBUG_RETURN(0);
|
||||
@ -1269,8 +1269,8 @@ int Gcalc_operation_reducer::get_result_thread(res_point *cur,
|
||||
}
|
||||
else
|
||||
{
|
||||
x= cur->pi->x;
|
||||
y= cur->pi->y;
|
||||
x= cur->pi->node.shape.x;
|
||||
y= cur->pi->node.shape.y;
|
||||
}
|
||||
if (storage->add_point(x, y))
|
||||
GCALC_DBUG_RETURN(1);
|
||||
|
Reference in New Issue
Block a user