diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-08-07 19:12:45 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-08-07 19:12:45 +0200 |
| commit | f835588cc2e32da97269cc58e97ee77b5927498a (patch) | |
| tree | 8e5c53593e7e3a9db0892afefb118fd0d581e23a /storage/tokudb/ha_tokudb_mrr_maria.cc | |
| parent | 0219ac1e98cc53250a8e165c4b37e83529932256 (diff) | |
| parent | b81b6d3f836feb682b963c9489f00ca1ee6a6a95 (diff) | |
| download | mariadb-git-f835588cc2e32da97269cc58e97ee77b5927498a.tar.gz | |
- Commiting merge files
Diffstat (limited to 'storage/tokudb/ha_tokudb_mrr_maria.cc')
| -rw-r--r-- | storage/tokudb/ha_tokudb_mrr_maria.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/storage/tokudb/ha_tokudb_mrr_maria.cc b/storage/tokudb/ha_tokudb_mrr_maria.cc index 9b0e92ed94d..7bf975a2221 100644 --- a/storage/tokudb/ha_tokudb_mrr_maria.cc +++ b/storage/tokudb/ha_tokudb_mrr_maria.cc @@ -88,6 +88,7 @@ PATENT RIGHTS GRANT: #ident "Copyright (c) 2007-2013 Tokutek Inc. All rights reserved." #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it." + /**************************************************************************** * DS-MRR implementation, essentially copied from InnoDB/MyISAM/Maria ***************************************************************************/ @@ -95,11 +96,6 @@ PATENT RIGHTS GRANT: /** * Multi Range Read interface, DS-MRR calls */ -#if MYSQL_VERSION_ID >= 100000 -#define COST_VECT Cost_estimate -#endif - - int ha_tokudb::multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param, uint n_ranges, uint mode, HANDLER_BUFFER *buf) |