diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-10-04 15:41:52 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-04 15:41:52 +0200 |
commit | 630b0b877937cfd564251a66d2e0166182bff4ff (patch) | |
tree | 53e64734919a809c95f246504ea337ae215ff88c /.bzrignore | |
parent | f3523559aaa5d6523d907d69de544ee24c9e6915 (diff) | |
download | mariadb-git-630b0b877937cfd564251a66d2e0166182bff4ff.tar.gz |
support for plugins on windows
CMakeLists.txt:
1. add -DSAFEMALLOC -DSAFE_MUTEX in the top-level CMakeLists.txt
don't force plugins to copy-paste these lines in their CMakeLists.txt
2.1 search plugin/* for plugins (not only storage/*),
2.2 recognize MYSQL_PLUGIN (not only MYSQL_STORAGE_ENGINE),
2.3 extract library names from the plug.in (don't force library names to
be ha_<engine>.dll and <engine>.lib)
include/mysql/plugin.h:
define MYSQL_PLUGIN_EXPORT appropriately
(backport from 5.5)
libmysqld/CMakeLists.txt:
remove unnecessary workaround
plugin/fulltext/CMakeLists.txt:
build fulltext example plugin on windows
storage/maria/CMakeLists.txt:
The library is called libmaria_s.lib, not maria.lib
storage/maria/unittest/CMakeLists.txt:
The library is called libmaria_s.lib, not maria.lib
storage/myisam/CMakeLists.txt:
The library is called libmyisam_s.lib, not myisam.lib
storage/mysql_storage_engine.cmake:
introduce MYSQL_PLUGIN macro.
don't force library names to be ha_<engine>.dll and <engine>.lib
storage/xtradb/CMakeLists.txt:
remove a condition from include
win/README:
don't use deprecated syntax
win/configure-mariadb.sh:
don't use deprecated syntax
win/configure.js:
1. support MYSQL_PLUGIN in addition to MYSQL_STORAGE_ENGINE.
2. support plugin/* in addition to storage/*
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index b2dd8a9447c..84ebe547912 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1952,3 +1952,8 @@ scripts/convert-debug-for-diff client/strings_def.h libmysql/strings_def.h libmysql_r/strings_def.h +CPackConfig.cmake +CPackSourceConfig.cmake +win/nmake_cache.txt +*.manifest +*.resource.txt |