diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-26 23:07:53 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-26 23:07:53 +0100 |
| commit | 64e308e28d2b0fb4cd005e23189e3639912bcd60 (patch) | |
| tree | 07aa8c5d623328ff0288dba79634ec3e2a9ed5e3 /plugin | |
| parent | 6be24a771a27a077d58d21a4a1f8db3fbd14cac4 (diff) | |
| download | mariadb-git-64e308e28d2b0fb4cd005e23189e3639912bcd60.tar.gz | |
Fix build and packaging on Windows:
- build executables we have in 5.3 (mysql_install_db.exe, mysq_upgrade_service.exe, upgrade wizard), and MSI
- add some missing headers to windows specific source files.
This needs to be done since 5.5 is using WIN32_LEAN_AND_MEAN preprocessor constant thus windows.h
no more includes whiole Windows
- do not deliver perl scripts (mysql_install_db.pl & friends) -they do not work, are not documented, and we
have native executables for this functionality. do not pack echo.exe, replace.exe into MSI, they
are not needed. Do not build resolveip on Windows, it is not used.
- precache results of of system checks in cmake/os/WindowsCache.cmake (like it is alreay done for majority of tests
to speed up cmake run with VS)
- make feedback plugin DEFAULT on Windows (so MSI works if user enables plugin),
fix null pointer access in PSI_register
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/feedback/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugin/feedback/feedback.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugin/feedback/CMakeLists.txt b/plugin/feedback/CMakeLists.txt index 7407cc65637..627e4d643fb 100644 --- a/plugin/feedback/CMakeLists.txt +++ b/plugin/feedback/CMakeLists.txt @@ -12,7 +12,7 @@ ENDIF(HAVE_NETDB_H) IF(WIN32) #SET(FEEDBACK_LIBS Ws2_32) - MYSQL_ADD_PLUGIN(FEEDBACK ${FEEDBACK_SOURCES} STATIC_ONLY) + MYSQL_ADD_PLUGIN(FEEDBACK ${FEEDBACK_SOURCES} STATIC_ONLY DEFAULT) ELSE(WIN32) MYSQL_ADD_PLUGIN(FEEDBACK ${FEEDBACK_SOURCES}) ENDIF(WIN32) diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc index 975aaef7d38..d7342eaa109 100644 --- a/plugin/feedback/feedback.cc +++ b/plugin/feedback/feedback.cc @@ -231,7 +231,7 @@ static int init(void *p) i_s_feedback->idx_field1 = 0; ///< virtual index on the 1st col #define PSI_register(X) \ - PSI_server->register_ ## X("feedback", X ## _list, array_elements(X ## _list)) + if(PSI_server) PSI_server->register_ ## X("feedback", X ## _list, array_elements(X ## _list)) PSI_register(mutex); PSI_register(cond); |