diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
| commit | 2e4984c185ddcd2da789017cd147338846ff409a (patch) | |
| tree | 0293831900c860600efbaa747ea886d9d1cbf5bd /storage/spider/spd_table.h | |
| parent | 792b53e80806df893ee62c9a1c1bd117114c8c6d (diff) | |
| parent | a6087e7dc1ef3561d8189c8db15e9591d0f9b520 (diff) | |
| download | mariadb-git-10.0-FusionIO.tar.gz | |
Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO
Conflicts:
storage/innobase/os/os0file.cc
storage/xtradb/os/os0file.cc
storage/xtradb/srv/srv0start.cc
Diffstat (limited to 'storage/spider/spd_table.h')
| -rw-r--r-- | storage/spider/spd_table.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/spider/spd_table.h b/storage/spider/spd_table.h index 858421444b1..e9d1d5c61c2 100644 --- a/storage/spider/spd_table.h +++ b/storage/spider/spd_table.h @@ -414,6 +414,11 @@ bool spider_check_direct_order_limit( ha_spider *spider ); +bool spider_check_index_merge( + TABLE *table, + st_select_lex *select_lex +); + int spider_compare_for_sort( SPIDER_SORT *a, SPIDER_SORT *b |