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.
This commit is contained in:
Alexey Botchkov 2011-11-20 12:30:43 +04:00
commit 5a4c91003a
6 changed files with 17 additions and 5 deletions

View file

@ -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;