diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-12-22 15:33:21 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-12-22 15:33:21 +0300 |
| commit | da5edf5057d392f3647570606220d80106c81a7b (patch) | |
| tree | 922a9e1f2882014f8c5a5a5f524bf88e39ed41dd /sql/Makefile.am | |
| parent | 19f6f52a21d48914a2542bcaf23806ace6870e8e (diff) | |
| download | mariadb-git-da5edf5057d392f3647570606220d80106c81a7b.tar.gz | |
MWL#67: MRR backport
- Make index condition pushdown be controlled by an @@optimizer_switch flag,
not by @@engine_condition_pushdown
- Make MRR buffer size be controlled by @@mrr_buffer_size, not
by @@read_rnd_buffer_size
- Move parts of code to separate files
- Code cleanup
- Add --sorted_result to some SELECTs in tests.
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index b2972072866..ab937c53601 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -47,7 +47,7 @@ mysqld_LDADD = libndb.la \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@ -noinst_HEADERS = ds_mrr.h item.h item_func.h item_sum.h item_cmpfunc.h \ +noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h \ item_xmlfunc.h \ item_create.h item_subselect.h item_row.h \ @@ -77,9 +77,10 @@ noinst_HEADERS = ds_mrr.h item.h item_func.h item_sum.h item_cmpfunc.h \ sql_plugin.h authors.h event_parse_data.h \ event_data_objects.h event_scheduler.h \ sql_partition.h partition_info.h partition_element.h \ - contributors.h sql_servers.h + contributors.h sql_servers.h \ + multi_range_read.h -mysqld_SOURCES = ds_mrr.cc sql_lex.cc sql_handler.cc sql_partition.cc \ +mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ item.cc item_sum.cc item_buff.cc item_func.cc \ item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \ thr_malloc.cc item_create.cc item_subselect.cc \ @@ -122,7 +123,9 @@ mysqld_SOURCES = ds_mrr.cc sql_lex.cc sql_handler.cc sql_partition.cc \ sql_plugin.cc sql_binlog.cc \ sql_builtin.cc sql_tablespace.cc partition_info.cc \ sql_servers.cc event_parse_data.cc \ - opt_table_elimination.cc + opt_table_elimination.cc \ + multi_range_read.cc \ + opt_index_cond_pushdown.cc nodist_mysqld_SOURCES = mini_client_errors.c pack.c client.c my_time.c my_user.c |