diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-04-11 20:44:52 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-04-11 20:44:52 -0700 |
| commit | 9e74665a2d91e299d1b9c5c2695855426aad78eb (patch) | |
| tree | 9c865c2e18fcb814ef80e96965debf53a0923e6a /libmysqld | |
| parent | 1c0a89afcc1581187e8ee84abbd445da2bfa45d9 (diff) | |
| parent | 85a025f30c5196c22c5b1d7960912fe9b3f0d6c0 (diff) | |
| download | mariadb-git-9e74665a2d91e299d1b9c5c2695855426aad78eb.tar.gz | |
Merge 5.5 -> 5.5-mwl248.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libmysqld/examples/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 9be06ec8397..bbfa7722fe0 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. +# Copyright (c) 2006, 2011, Oracle and/or its affiliates. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -96,7 +96,6 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/create_options.cc ../sql/rpl_utility.cc ../sql/rpl_reporting.cc ../sql/sql_expression_cache.cc - ../sql/sql_logger.cc ${GEN_SOURCES} ${MYSYS_LIBWRAP_SOURCE} ) diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index e62b2a193e4..e607f3c685a 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |