diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-11-20 12:30:43 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-11-20 12:30:43 +0400 |
| commit | 5a4c91003a73c551d89e0c6878edfe03704352fe (patch) | |
| tree | 2be110dc992f0631b422ea2ea9a55fe64e8beb28 /sql/gcalc_slicescan.cc | |
| parent | 8ea398292e9c5ae8e8efcaccde8e781317855d13 (diff) | |
| download | mariadb-git-5a4c91003a73c551d89e0c6878edfe03704352fe.tar.gz | |
Fix for bug #809849 spatial operations must be KILL-able.
Checks for thd->killed state added to the long loops in geometry calculations.
per-file comments:
sql/gcalc_slicescan.cc
Fix for bug #809849 spatial operations must be KILL-able.
checks for TERMINATED_STATE added.
sql/gcalc_slicescan.h
Fix for bug #809849 spatial operations must be KILL-able.
defines added to include checks for termination in the
library.
sql/gcalc_tools.cc
Fix for bug #809849 spatial operations must be KILL-able.
checks for TERMINATED_STATE added.
sql/gcalc_tools.h
Fix for bug #809849 spatial operations must be KILL-able.
TERMINATED_STATE pointers added.
sql/item_geofunc.cc
Fix for bug #809849 spatial operations must be KILL-able.
sql/item_geofunc.h
Fix for bug #809849 spatial operations must be KILL-able.
Diffstat (limited to 'sql/gcalc_slicescan.cc')
| -rw-r--r-- | sql/gcalc_slicescan.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/gcalc_slicescan.cc b/sql/gcalc_slicescan.cc index a294a792490..624ca1aff56 100644 --- a/sql/gcalc_slicescan.cc +++ b/sql/gcalc_slicescan.cc @@ -1078,6 +1078,7 @@ void Gcalc_scan_iterator::init(Gcalc_heap *points) #ifndef GCALC_DBUG_OFF m_cur_thread= 0; #endif /*GCALC_DBUG_OFF*/ + GCALC_SET_TERMINATED(killed, 0); } void Gcalc_scan_iterator::reset() @@ -1263,6 +1264,9 @@ int Gcalc_scan_iterator::step() GCALC_DBUG_ENTER("Gcalc_scan_iterator::step"); GCALC_DBUG_ASSERT(more_points()); + if (GCALC_TERMINATED(killed)) + GCALC_DBUG_RETURN(0xFFFF); + /* Clear the old event marks. */ if (m_bottom_points) { |