diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-06-13 16:10:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-06-13 16:10:25 +0200 |
| commit | f61f36b386e8d0c6448297bb84c92e8d9b82be6a (patch) | |
| tree | 6248b04e9a41d2df2270ead15d62afde7f57aa69 /sql/CMakeLists.txt | |
| parent | 2caeda442502b5ea2583a0ce15107d171e06dfcd (diff) | |
| parent | 55b010233a2d897ac8bc7aee0f136f2794814455 (diff) | |
| download | mariadb-git-f61f36b386e8d0c6448297bb84c92e8d9b82be6a.tar.gz | |
Merge branch '10.0' into 10.1
Conflicts:
CMakeLists.txt
VERSION
Modified:
.gitignore
Diffstat (limited to 'sql/CMakeLists.txt')
| -rw-r--r-- | sql/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 41e27017c2b..3ea72b828f2 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -78,7 +78,7 @@ SET (SQL_SOURCE sql_profile.cc event_parse_data.cc sql_alter.cc sql_signal.cc rpl_handler.cc mdl.cc sql_admin.cc transaction.cc sys_vars.cc sql_truncate.cc datadict.cc - sql_reload.cc sql_cmd.h + sql_reload.cc sql_cmd.h item_inetfunc.cc # added in MariaDB: sql_explain.h sql_explain.cc |