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_tools.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/gcalc_tools.h')
| -rw-r--r-- | sql/gcalc_tools.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/gcalc_tools.h b/sql/gcalc_tools.h index b89a9a45e07..eed9be0803f 100644 --- a/sql/gcalc_tools.h +++ b/sql/gcalc_tools.h @@ -218,6 +218,7 @@ public: void init(Gcalc_function *fn, modes mode= default_mode); Gcalc_operation_reducer(Gcalc_function *fn, modes mode= default_mode, size_t blk_size=8192); + GCALC_DECL_TERMINATED_STATE(killed) int count_slice(Gcalc_scan_iterator *si); int count_all(Gcalc_heap *hp); int get_result(Gcalc_result_receiver *storage); |