diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 21:24:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 21:24:22 +0100 |
| commit | a2bcee626d4ef2836e38e4932305871390164644 (patch) | |
| tree | b41e357427318bad8985078b91bbd2b0360defc8 /support-files | |
| parent | 1788bfe93a745582d938a608d5959b7d2e6b2f23 (diff) | |
| parent | 4fdf25afa8188905653a83e08fc387243e584600 (diff) | |
| download | mariadb-git-a2bcee626d4ef2836e38e4932305871390164644.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/compiler_warnings.supp | 21 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 2 |
2 files changed, 20 insertions, 3 deletions
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index 5e0df670dae..61c6b483aa9 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -178,11 +178,19 @@ jemalloc/src/jemalloc\.c: set but not used # # Connect engine # -storage/connect/ha_connect\.cc: might be clobbered by -storage/connect/connect\.cc: might be clobbered by +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 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 # # Mroonga @@ -214,6 +222,15 @@ ctype-simple\.c : .*unary minus operator applied to unsigned type, result still 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.server.sh b/support-files/mysql.server.sh index aa02b7eac78..e5cdbfd3ce8 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -209,7 +209,7 @@ else fi fi -parse_server_arguments `$print_defaults $extra_args mysqld server mysql_server mysql.server` +parse_server_arguments `$print_defaults $extra_args --mysqld mysql.server` parse_server_arguments "$@" # wait for the pid file to disappear |