diff options
author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-03-15 00:37:37 +0100 |
---|---|---|
committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-03-15 00:37:37 +0100 |
commit | d110e0377dda1bb9f5a5c36745d3a6feb8e8a1d4 (patch) | |
tree | bd61f8e0207c7ec18376c21b89e4418879bea160 /libmysqld | |
parent | c3c14a069b53968bbb47fda7adabd4947c272996 (diff) | |
download | mariadb-git-d110e0377dda1bb9f5a5c36745d3a6feb8e8a1d4.tar.gz |
Fix compile error - linker does not find extern variables, in sql_logger.c
The file uses external variables defined in another (C++) source file. Since MSVC mangles variables and not only functions, either variables in question should be extern "C", or sql_logger should be made C++ for link to succeed.
Fixed by renaming sql_logger.c to sql_logger.cc
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 993d54f8aae..6603983e69b 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -95,7 +95,7 @@ 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.c + ../sql/sql_logger.cc ${GEN_SOURCES} ${MYSYS_LIBWRAP_SOURCE} ) |