diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-19 14:24:38 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-19 14:24:38 -0500 |
| commit | dad555a09c8d590132c77c192a18d7fc1f8fe91e (patch) | |
| tree | 38fb545e5df0a24333b8284c816f5bea95d19a03 /support-files | |
| parent | 18173ddfc4081407832d9a6703d1b8356b7defe9 (diff) | |
| parent | 90ea0145856338221803ebb9b446ed2a6e082412 (diff) | |
| download | mariadb-git-dad555a09c8d590132c77c192a18d7fc1f8fe91e.tar.gz | |
Merge tag 'mariadb-10.0.23' into 10.0-galera
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/compiler_warnings.supp | 18 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index 00434d89e2a..47eb8a827f1 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -184,10 +184,19 @@ 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 @@ -213,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 c9398b6c020..b562354a586 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -213,7 +213,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 |