diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-14 20:57:48 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-15 12:51:35 +0100 |
| commit | 5f078cc8ff1f8af979d8852bf62fa259f41b1f93 (patch) | |
| tree | 30f618e92bd84a7fa5dec49c49d5108e7eb8381c /sql/gcalc_tools.cc | |
| parent | 2a4781789612c6c53cbe12c1426f93b15737a148 (diff) | |
| download | mariadb-git-5f078cc8ff1f8af979d8852bf62fa259f41b1f93.tar.gz | |
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.
Diffstat (limited to 'sql/gcalc_tools.cc')
| -rw-r--r-- | sql/gcalc_tools.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/gcalc_tools.cc b/sql/gcalc_tools.cc index 864437401b7..f3c24f9bdf3 100644 --- a/sql/gcalc_tools.cc +++ b/sql/gcalc_tools.cc @@ -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); |