mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
c238e9b96a
sig_return: Solaris/OSX returns different function ptr
Move defination to my_alarm.h as its the only use.
prevents compile warnings (copied from 10.3 branch)
mysys/my_sync.c:136:19: error: 'cur_dir_name' defined but not used [-Werror=unused-const-variable=]
136 | static const char cur_dir_name[]= {FN_CURLIB, 0};
| ^~~~~~~~~~~~
fix compile error (DEPRECATED) leaked from ssl headers.
In file included from /export/home/dan/mariadb-server-10.4/sql/sys_vars.cc:37:
/export/home/dan/mariadb-server-10.4/sql/sys_vars.ic:69: error: "DEPRECATED" redefined [-Werror]
69 | #define DEPRECATED(X) X
|
In file included from /export/home/dan/mariadb-server-10.4/include/violite.h:150,
from /export/home/dan/mariadb-server-10.4/sql/sql_class.h:38,
from /export/home/dan/mariadb-server-10.4/sql/sys_vars.cc:36:
/usr/include/openssl/ssl.h:2356: note: this is the location of the previous definition
2356 | # define DEPRECATED __attribute__((deprecated))
|
Avoid Werror condition on non-Linux:
plugin/server_audit/server_audit.c:2267:7: error: variable 'db_len_off' set but not used [-Werror=unused-but-set-variable]
2267 | int db_len_off;
| ^~~~~~~~~~
plugin/server_audit/server_audit.c:2266:7: error: variable 'db_off' set but not used [-Werror=unused-but-set-variable]
2266 | int db_off;
| ^~~~~~
auth_gssapi fix include path for Solaris
Consistent with the upstream packaged patch:
https://github.com/OpenIndiana/oi-userland/blob/oi/hipster/components/database/mariadb-103/patches/06-gssapi.h.patch
compile warnings on Solaris
[ 91%] Building C object plugin/server_audit/CMakeFiles/server_audit.dir/server_audit.c.o
/plugin/server_audit/server_audit.c: In function 'auditing_v8':
/plugin/server_audit/server_audit.c:2194:20: error: unused variable 'db_len_off' [-Werror=unused-variable]
2194 | static const int db_len_off= 128;
| ^~~~~~~~~~
/plugin/server_audit/server_audit.c:2193:20: error: unused variable 'db_off' [-Werror=unused-variable]
2193 | static const int db_off= 120;
| ^~~~~~
/plugin/server_audit/server_audit.c:2192:20: error: unused variable 'cmd_off' [-Werror=unused-variable]
2192 | static const int cmd_off= 4432;
| ^~~~~~~
At top level:
/plugin/server_audit/server_audit.c:2192:20: error: 'cmd_off' defined but not used [-Werror=unused-const-variable=]
/plugin/server_audit/server_audit.c:2193:20: error: 'db_off' defined but not used [-Werror=unused-const-variable=]
2193 | static const int db_off= 120;
| ^~~~~~
/plugin/server_audit/server_audit.c:2194:20: error: 'db_len_off' defined but not used [-Werror=unused-const-variable=]
2194 | static const int db_len_off= 128;
| ^~~~~~~~~~
cc1: all warnings being treated as errors
tested on:
$ uname -a
SunOS openindiana 5.11 illumos-b97b1727bc i86pc i386 i86pc
|
||
|---|---|---|
| .. | ||
| array.c | ||
| base64.c | ||
| ChangeLog | ||
| charset-def.c | ||
| charset.c | ||
| checksum.c | ||
| CMakeLists.txt | ||
| errors.c | ||
| file_logger.c | ||
| get_password.c | ||
| hash.c | ||
| lf_alloc-pin.c | ||
| lf_dynarray.c | ||
| lf_hash.c | ||
| list.c | ||
| ma_dyncol.c | ||
| mf_arr_appstr.c | ||
| mf_cache.c | ||
| mf_dirname.c | ||
| mf_fn_ext.c | ||
| mf_format.c | ||
| mf_getdate.c | ||
| mf_iocache.c | ||
| mf_iocache2.c | ||
| mf_keycache.c | ||
| mf_keycaches.c | ||
| mf_loadpath.c | ||
| mf_pack.c | ||
| mf_path.c | ||
| mf_qsort.c | ||
| mf_qsort2.c | ||
| mf_radix.c | ||
| mf_same.c | ||
| mf_sort.c | ||
| mf_soundex.c | ||
| mf_tempdir.c | ||
| mf_tempfile.c | ||
| mf_unixpath.c | ||
| mf_wcomp.c | ||
| mulalloc.c | ||
| my_access.c | ||
| my_addr_resolve.c | ||
| my_alarm.c | ||
| my_alloc.c | ||
| my_atomic.c | ||
| my_atomic_writes.c | ||
| my_basename.c | ||
| my_bit.c | ||
| my_bitmap.c | ||
| my_chmod.c | ||
| my_chsize.c | ||
| my_compare.c | ||
| my_compress.c | ||
| my_conio.c | ||
| my_context.c | ||
| my_copy.c | ||
| my_create.c | ||
| my_default.c | ||
| my_delete.c | ||
| my_div.c | ||
| my_dlerror.c | ||
| my_error.c | ||
| my_file.c | ||
| my_fopen.c | ||
| my_fstream.c | ||
| my_gethwaddr.c | ||
| my_getncpus.c | ||
| my_getopt.c | ||
| my_getpagesize.c | ||
| my_getsystime.c | ||
| my_getwd.c | ||
| my_init.c | ||
| my_largepage.c | ||
| my_lib.c | ||
| my_libwrap.c | ||
| my_lock.c | ||
| my_lockmem.c | ||
| my_malloc.c | ||
| my_memmem.c | ||
| my_mess.c | ||
| my_mkdir.c | ||
| my_mmap.c | ||
| my_new.cc | ||
| my_once.c | ||
| my_open.c | ||
| my_port.c | ||
| my_pread.c | ||
| my_pthread.c | ||
| my_quick.c | ||
| my_rdtsc.c | ||
| my_read.c | ||
| my_redel.c | ||
| my_rename.c | ||
| my_rnd.c | ||
| my_safehash.c | ||
| my_safehash.h | ||
| my_seek.c | ||
| my_setuser.c | ||
| my_sleep.c | ||
| my_static.c | ||
| my_static.h | ||
| my_symlink.c | ||
| my_symlink2.c | ||
| my_sync.c | ||
| my_thr_init.c | ||
| my_timer_cycles.il | ||
| my_uuid.c | ||
| my_wincond.c | ||
| my_windac.c | ||
| my_winerr.c | ||
| my_winfile.c | ||
| my_winthread.c | ||
| my_write.c | ||
| mysys_priv.h | ||
| psi_noop.c | ||
| ptr_cmp.c | ||
| queues.c | ||
| safemalloc.c | ||
| stacktrace.c | ||
| string.c | ||
| test_charset.c | ||
| test_dir.c | ||
| test_thr_mutex.c | ||
| test_xml.c | ||
| testhash.c | ||
| thr_alarm.c | ||
| thr_lock.c | ||
| thr_mutex.c | ||
| thr_rwlock.c | ||
| thr_timer.c | ||
| tree.c | ||
| typelib.c | ||
| waiting_threads.c | ||
| wqueue.c | ||