diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-12-22 15:49:15 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-12-22 15:49:15 +0300 |
| commit | 19c8976d854ecdd6ee50eeb58d3b4931998da8c7 (patch) | |
| tree | 194a77b0bf65d6017a0c39741d151dafb8b5716d /libmysqld | |
| parent | da5edf5057d392f3647570606220d80106c81a7b (diff) | |
| parent | 26d675c638ab52cdbc7a6dc259da84a3a4ab26b9 (diff) | |
| download | mariadb-git-19c8976d854ecdd6ee50eeb58d3b4931998da8c7.tar.gz | |
Merge MWL#67: MRR Backport and BKA backport.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 1785c0c404a..a89fbe72e92 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -123,7 +123,8 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/sql_class.cc ../sql/sql_crypt.cc ../sql/sql_cursor.cc ../sql/sql_db.cc ../sql/sql_delete.cc ../sql/sql_derived.cc ../sql/sql_do.cc ../sql/sql_error.cc ../sql/sql_handler.cc - ../sql/sql_help.cc ../sql/sql_insert.cc ../sql/sql_lex.cc + ../sql/sql_help.cc ../sql/sql_insert.cc ../sql/sql_join_cache.cc + ../sql/sql_lex.cc ../sql/sql_list.cc ../sql/sql_load.cc ../sql/sql_locale.cc ../sql/sql_binlog.cc ../sql/sql_manager.cc ../sql/sql_map.cc ../sql/sql_parse.cc ../sql/sql_partition.cc ../sql/sql_plugin.cc diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 4c01930fd2d..d2f1113041c 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -63,6 +63,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ sql_profile.cc \ sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \ sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \ + sql_join_cache.cc \ sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc \ scheduler.cc sql_connect.cc sql_parse.cc \ sql_prepare.cc sql_derived.cc sql_rename.cc \ |