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/item_geofunc.h | |
| 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/item_geofunc.h')
| -rw-r--r-- | sql/item_geofunc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h index f3208c5b4d4..d2030ee7bb9 100644 --- a/sql/item_geofunc.h +++ b/sql/item_geofunc.h @@ -266,7 +266,6 @@ public: Gcalc_function::op_type spatial_op; Gcalc_heap collector; Gcalc_function func; - Gcalc_scan_iterator scan_it; Gcalc_result_receiver res_receiver; Gcalc_operation_reducer operation; @@ -323,7 +322,6 @@ protected: }; Gcalc_heap collector; Gcalc_function func; - Gcalc_scan_iterator scan_it; Gcalc_result_receiver res_receiver; Gcalc_operation_reducer operation; |