diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-01-03 23:16:16 +0100 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-01-03 23:16:16 +0100 |
| commit | b01348879d066c3207ac70aa630ed021a2552920 (patch) | |
| tree | 44b64f886288ac8b8b5c49ae9a94fe574ddc7c5f /libmysqld | |
| parent | 7714496dc1c72d01fd214cb7737ca4216a982e0f (diff) | |
| parent | ca020dfa9e8668ce52eaff92c157097bba671ec1 (diff) | |
| download | mariadb-git-b01348879d066c3207ac70aa630ed021a2552920.tar.gz | |
MWL#182: Explain running statements: merge with 5.3-main (needs fixing)
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 12b33e6092b..1c1ed2cabd8 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -146,6 +146,7 @@ SET(LIBMYSQLD_SOURCES libmysqld.c emb_qcache.cc lib_sql.cc ../sql/create_options.cc ../sql/rpl_utility.cc ../sql/rpl_reporting.cc ../sql/sql_expression_cache.cc + ../sql/my_apc.cc ../sql/my_apc.h ${GEN_SOURCES} ${LIB_SOURCES}) diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index cffde1c7db1..412fc1e2e9f 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -83,7 +83,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ rpl_injector.cc my_user.c partition_info.cc \ sql_servers.cc event_parse_data.cc opt_table_elimination.cc \ multi_range_read.cc opt_index_cond_pushdown.cc \ - sql_expression_cache.cc + sql_expression_cache.cc my_apc.cc # automake misses these sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy |