diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-10-27 21:41:19 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-10-27 21:41:19 +0400 |
| commit | 286a751490cd109a470e30ef486755cd4922802d (patch) | |
| tree | c872e9c0ead4815600c2e1e490346e5805d16fec /libmysqld | |
| parent | 08e9e6a790ea6ba8bbe6fa5c5bd54677f4add072 (diff) | |
| parent | ba09d25abc1fd3dbe55f1d7974cfe6a1ebda4df0 (diff) | |
| download | mariadb-git-286a751490cd109a470e30ef486755cd4922802d.tar.gz | |
MWL#182: Explain running statements
- Merge with 5.3-main
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 9a3627da606..ca9d3cba3b1 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -144,6 +144,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 bf2231f47a1..980de9a08ba 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -81,7 +81,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 |