summaryrefslogtreecommitdiff
path: root/sql/gcalc_tools.h
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2011-10-14 16:10:55 +0500
committerAlexey Botchkov <holyfoot@askmonty.org>2011-10-14 16:10:55 +0500
commit8432284d4fe276db8fe99f434b98e3631e707146 (patch)
tree1d3e04875c1216df898f3fb575475091c6cb0bc6 /sql/gcalc_tools.h
parentbf2deb5ed30b03e9cada6162d8aa837115dce4cc (diff)
downloadmariadb-git-8432284d4fe276db8fe99f434b98e3631e707146.tar.gz
GIS code.
Forward calculations introduced. per-file comments: sql/gcalc_slicescan.cc sql/gcalc_slicescan.h sql/gcalc_tools.cc sql/gcalc_tools.h sql/item_geofunc.cc
Diffstat (limited to 'sql/gcalc_tools.h')
-rw-r--r--sql/gcalc_tools.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/gcalc_tools.h b/sql/gcalc_tools.h
index ca740dcdc11..b89a9a45e07 100644
--- a/sql/gcalc_tools.h
+++ b/sql/gcalc_tools.h
@@ -233,7 +233,6 @@ public:
union
{
const Gcalc_heap::Info *pi;
- const Gcalc_heap::Intersection_info *ii;
res_point *first_poly_node;
};
union
@@ -331,7 +330,7 @@ private:
int continue_range(active_thread *t, const Gcalc_heap::Info *p,
const Gcalc_heap::Info *p_next);
int continue_i_range(active_thread *t,
- const Gcalc_heap::Intersection_info *ii);
+ const Gcalc_heap::Info *ii);
int end_couple(active_thread *t0, active_thread *t1, const Gcalc_heap::Info *p);
int get_single_result(res_point *res, Gcalc_result_receiver *storage);
int get_result_thread(res_point *cur, Gcalc_result_receiver *storage,