diff options
author | Igor Babaev <igor@askmonty.org> | 2013-01-10 22:33:23 -0800 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2013-01-10 22:33:23 -0800 |
commit | 1ef07d0845300ad200671f9809dcd9ee8b2ff837 (patch) | |
tree | 5c22187a94c73c7f8099a5d366ab3fd425f8e578 /libmysqld | |
parent | 421bbdcf1004806ccbee7b45d55e90ddc15c76ae (diff) | |
parent | f853333e09b222f6d6d76d9343b6202b4769ffab (diff) | |
download | mariadb-git-1ef07d0845300ad200671f9809dcd9ee8b2ff837.tar.gz |
Merge 10.0-base -> 10.0.
Also fixed a bug in sql_update.cc: the code of mysql_update() lacked
a call of set_statistics_for_table().
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index b3ce2ce720b..9f79b94c6a9 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -75,7 +75,8 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/debug_sync.cc ../sql/opt_table_elimination.cc ../sql/sql_prepare.cc ../sql/sql_rename.cc ../sql/sql_repl.cc ../sql/sql_select.cc ../sql/sql_servers.cc - ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc + ../sql/sql_show.cc ../sql/sql_state.c + ../sql/sql_statistics.cc ../sql/sql_string.cc ../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc ../sql/sql_update.cc ../sql/sql_view.cc ../sql/sql_profile.cc |