diff options
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | support-files/compiler_warnings.supp | 48 | ||||
| -rw-r--r-- | support-files/mysql-log-rotate.sh | 3 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 13 | ||||
| -rw-r--r-- | support-files/rpm/server-postin.sh | 5 | ||||
| -rw-r--r-- | support-files/rpm/server.cnf | 12 |
6 files changed, 64 insertions, 19 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 5e9fd081a09..cc9eed6c7be 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -41,12 +41,14 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() +IF (NOT WITHOUT_SERVER) FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} DESTINATION ${inst_location} COMPONENT IniFiles) ENDFOREACH() +ENDIF() IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index 6a31ff21c55..9f9215704ec 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -28,7 +28,6 @@ pars0grm.c: 'yyerrorlab' : unreferenced label _flex_tmp.c: .*not enough actual parameters for macro 'yywrap'.* lexyy.c : not enough actual parameters for macro 'yywrap' pars0lex.l: .*conversion from 'ulint' to 'int', possible loss of data.* -btr/btr0cur\.c: .*value computed is not used.*: 3175-3375 include/buf0buf\.ic: unused parameter .*mtr.* fil/fil0fil\.c: pointer targets in passing argument.*differ in signedness fil/fil0fil\.c: comparison between signed and unsigned : 3100-3199 @@ -44,7 +43,9 @@ ut/ut0ut\.c: ignoring return value of srv/srv0srv\.c: value computed is not used buf/buf0buf\.c: .*block_mutex.* might be used uninitialized btr/btr0cur\.c: null argument where non-null required: 1800-3000 -btr/btr0btr\.c: null argument where non-null required: 2500-3000 +btr/btr0btr\.c: null argument where non-null required +btr/btr0cur\.c: .*value computed is not used.*: 3175-3375 +btr/btr0sea\.c: passing argument 2 .* discards qualifiers from pointer target type ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000 fsp0fsp\.c: result of 32-bit shift implicitly converted to 64 bits log/log0log\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type @@ -52,6 +53,12 @@ log/log0online\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointe buf/buf0buf\.c : label.*loop2.* defined but not used # +# Xtradb engine +# +storage/xtradb/handler/ha_innodb\.cc: ignoring return value of +storage/xtradb/row/row0log\.cc: ignoring return value of + +# # bdb is not critical to keep up to date # .*/bdb/.* : .*discards qualifiers from pointer target type.* @@ -149,6 +156,13 @@ mySTL/algorithm\.hpp: is used uninitialized in this function include/pwdbased\.hpp: comparison of unsigned expression # +# OpenSSL +# +# The following comes because of different prototype between yassl and openssl. +# Save as the argument is a function withing the library. +vio/viosslfactories\.c: discards ~const~ qualifier from pointer target type + +# # Groff warnings on OpenSUSE. # .*/dbug/.*(groff|<standard input>) : .* @@ -165,6 +179,24 @@ include/pwdbased\.hpp: comparison of unsigned expression # jemalloc # jemalloc/src/jemalloc\.c: always_inline function might not be inlinable +jemalloc/src/jemalloc\.c: set but not used + +# +# Connect engine +# +storage/connect/ha_connect\.cc: might be clobbered by .*longjmp +storage/connect/connect\.cc: might be clobbered by .*longjmp +storage/connect/filamvct\.cpp: ignoring return value of +storage/connect/filamvct\.cpp: might be clobbered by .*longjmp +storage/connect/xindex\.cpp: ignoring return value of +storage/connect/value\.cpp: always false + +# +# mroonga +# +groonga/lib/expr\.c: propagation disabled +groonga/lib/expr\.c: PRE disabled +groonga/lib/expr\.c: always false # # Unexplanable (?) stuff @@ -187,6 +219,18 @@ ma_packrec\.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 550 # .* : .*no matching operator delete found; memory will not be freed if initialization throws an exception.* ctype-simple\.c : .*unary minus operator applied to unsigned type, result still unsigned.* +sql/sys_vars\.cc : invalid access to non-static data member +string3\.h : memset used with constant zero length parameter + +# +# Ignorable errors on mac +# +my_aes\.c: deprecated +my_sha1\.cc: deprecated +my_md5\.cc: deprecated +my_rnd\.cc: deprecated +mdl\.cc: invalid access +mdl\.cc: offsetoff # Wrong warning due to GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478 regexec\.c : passing argument 3 of.*matcher.* discards qualifiers from pointer target type diff --git a/support-files/mysql-log-rotate.sh b/support-files/mysql-log-rotate.sh index 0ee78b0f7ca..5d1b30b208e 100644 --- a/support-files/mysql-log-rotate.sh +++ b/support-files/mysql-log-rotate.sh @@ -30,7 +30,8 @@ if test -x @bindir@/mysqladmin && \ @bindir@/mysqladmin ping &>/dev/null then - @bindir@/mysqladmin flush-logs + @bindir@/mysqladmin --local flush-error-log \ + flush-engine-log flush-general-log flush-slow-log fi endscript } diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index c1d85ba2664..958902620a5 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -114,12 +114,6 @@ mode=$1 # start or stop [ $# -ge 1 ] && shift - -other_args="$*" # uncommon, but needed when called from an RPM upgrade action - # Expected: "--skip-networking --skip-grant-tables" - # They are not checked here, intentionally, as it is the resposibility - # of the "spec" file author to give correct arguments only. - case `echo "testing\c"`,`echo -n testing` in *c*,-n*) echo_n= echo_c= ;; *c*,*) echo_n=-n echo_c= ;; @@ -207,6 +201,7 @@ else fi parse_server_arguments `$print_defaults $extra_args --mysqld mysql.server` +parse_server_arguments "$@" # wait for the pid file to disappear wait_for_gone () { @@ -304,7 +299,7 @@ case "$mode" in then # Give extra arguments to mysqld with the my.cnf file. This script # may be overwritten at next upgrade. - $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" $other_args & + $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" & wait_for_ready; return_value=$? # Make lock for RedHat / SuSE @@ -351,8 +346,8 @@ case "$mode" in 'restart') # Stop the service and regardless of whether it was # running or not, start it again. - if $0 stop $other_args; then - $0 start $other_args + if $0 stop "$@"; then + $0 start "$@" else log_failure_msg "Failed to stop running server, so refusing to try to start." exit 1 diff --git a/support-files/rpm/server-postin.sh b/support-files/rpm/server-postin.sh index 139d9e3f700..daf68f00c0c 100644 --- a/support-files/rpm/server-postin.sh +++ b/support-files/rpm/server-postin.sh @@ -31,6 +31,11 @@ if [ $1 = 1 ] ; then # The user may already exist, make sure it has the proper group nevertheless (BUG#12823) usermod --gid %{mysqld_group} %{mysqld_user} 2> /dev/null || true + # Temporary Workaround for MDEV-11386 - will be corrected in Advance Toolchain 10.0-3 and 8.0-8 + for ldconfig in /opt/at*/sbin/ldconfig; do + test -x $ldconfig && $ldconfig + done + # Change permissions so that the user that will run the MySQL daemon # owns all database files. chown -R %{mysqld_user}:%{mysqld_group} $datadir diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf index 2025a8b811a..a197868d16c 100644 --- a/support-files/rpm/server.cnf +++ b/support-files/rpm/server.cnf @@ -14,15 +14,13 @@ # this is only for embedded server [embedded] -# This group is only read by MariaDB-5.5 servers. -# If you use the same .cnf file for MariaDB of different versions, -# use this group for options that older servers don't understand -[mysqld-5.5] - -# These two groups are only read by MariaDB servers, not by MySQL. +# This group is only read by MariaDB servers, not by MySQL. # If you use the same .cnf file for MySQL and MariaDB, # you can put MariaDB-only options here [mariadb] -[mariadb-5.5] +# This group is only read by MariaDB-10.0 servers. +# If you use the same .cnf file for MariaDB of different versions, +# use this group for options that older servers don't understand +[mariadb-10.0] |