diff options
author | unknown <monty@mysql.com> | 2004-04-08 13:58:06 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-04-08 13:58:06 +0300 |
commit | 16845a71aa333bd43522a90652c87dcd953f9191 (patch) | |
tree | a2db2fbae50b0568aeaf80c5eb2dbb8027359da4 /sql/opt_range.h | |
parent | 3cb13f7926334b6542d46d6a78c8aadeb1aefcc8 (diff) | |
download | mariadb-git-16845a71aa333bd43522a90652c87dcd953f9191.tar.gz |
Moved reading of ranges from opt_range.cc to handler.cc
This gives the handler more optimization possiblities and is needed for NDB cluster
Fixed not-initialized memory error detected by valgrind
mysql-test/mysql-test-run.sh:
Fixed address to manual page
mysql-test/r/gis-rtree.result:
Added test to show fatal error in GIS
mysql-test/r/grant.result:
New tests
mysql-test/t/gis-rtree.test:
New tests
mysql-test/t/grant.test:
New tests
sql/handler.cc:
Moved reading of ranges from opt_range.cc to handler.cc
This gives the handler more optimization possiblities and is needed for NDB cluster
sql/handler.h:
Moved reading of ranges from opt_range.cc to handler.cc
T
sql/opt_range.cc:
Moved reading of ranges from opt_range.cc to handler.cc
Simplified GIS get_next() handling
Indentation cleanups
sql/opt_range.h:
Removed not needed cmp_next()
Added new QUICK_SELECT method for GIS keys to make code for normal keys easier and faster
sql/sql_select.cc:
Fixed wrong handling of usable-keys in test_if_skip_sort_order (not fatal, just a warning from valgrind)
Added DBUG
Cleaned up comments
Diffstat (limited to 'sql/opt_range.h')
-rw-r--r-- | sql/opt_range.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h index 4af56393a57..2df9d93e1ef 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -89,11 +89,20 @@ public: int init() { return error=file->index_init(index); } virtual int get_next(); virtual bool reverse_sorted() { return 0; } - int cmp_next(QUICK_RANGE *range); bool unique_key_range(); }; +class QUICK_SELECT_GEOM: public QUICK_SELECT +{ +public: + QUICK_SELECT_GEOM(THD *thd, TABLE *table, uint index_arg, bool no_alloc) + :QUICK_SELECT(thd, table, index_arg, no_alloc) + {}; + virtual int get_next(); +}; + + class QUICK_SELECT_DESC: public QUICK_SELECT { public: |