diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 12:00:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 12:00:23 +0200 |
| commit | 909775a7623505bea1b42327c7ce592b649dcdab (patch) | |
| tree | 13dc2799539d83d0d02b0f4e2d9593489eb0bf27 /support-files | |
| parent | 39f82b4e6ebed949ba17fe4884d96471574c1da1 (diff) | |
| parent | 6d06ccbe5384874877485ddc470a89217d90c88d (diff) | |
| download | mariadb-git-909775a7623505bea1b42327c7ce592b649dcdab.tar.gz | |
mariadb-5.5.33 merge
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | support-files/compiler_warnings.supp | 14 |
2 files changed, 3 insertions, 17 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 6fbd52a64eb..a10342b7fec 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -111,11 +111,11 @@ IF(UNIX) INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} COMPONENT Common) - INSTALL(FILES rpm/client.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d + INSTALL(FILES rpm/client.cnf DESTINATION ${INSTALL_SYSCONF2DIR} COMPONENT SharedLibraries) - INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d + INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR} COMPONENT Client) - INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d + INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR} COMPONENT IniFiles) # This is for SuSE: diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index edccc6e5975..cd39b3f7a9d 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -132,25 +132,11 @@ signal\.c : .*unused parameter.* storage/maria/ma_pagecache.c: .*'info_check_pin' defined but not used # -# Pbxt -# -xaction_xt\.cc: may be used uninitialized in this function -lock_xt\.cc : uninitialized local variable .* used -restart_xt\.cc : dereferencing pointer .* does break strict-aliasing - -# # oqgraph errors that are hard to fix # oqgraph/graphcore\.cc : may be used uninitialized in this function # -# I think these are due to mix of C and C++. -# -storage/pbxt/ : typedef.*was ignored in this declaration -ha_pbxt\.cc : variable.*might be clobbered by.*longjmp -table_xt\.cc : variable.*might be clobbered by.*longjmp - -# # Yassl # include/runtime.hpp: .*pure_error.* |