database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-11 09:43:05 +03:00
Code Activity

MDEV-8378 - Debian: the Lintian complains about many "shlib-calls-exit" in many

Browse Source 
of the plugins

Removed exit() from daemon_example, pass error to caller instead.
Also removed unused my_abort_hook.
This commit is contained in:
Sergey Vojtovich
2015-12-16 19:39:00 +04:00
parent 71eee693b2
commit 90ea014585
4 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/my_sys.h
View File

@@ -259,8 +259,7 @@ extern myf my_global_flags; /* Set to MY_WME for more error messages
/* Point to current my_message() */ /* Point to current my_message() */
extern void (*my_sigtstp_cleanup)(void), extern void (*my_sigtstp_cleanup)(void),
/* Executed before jump to shell */ /* Executed before jump to shell */
(*my_sigtstp_restart)(void), (*my_sigtstp_restart)(void);
(*my_abort_hook)(int);
/* Executed when comming from shell */ /* Executed when comming from shell */
extern MYSQL_PLUGIN_IMPORT int my_umask; /* Default creation mask */ extern MYSQL_PLUGIN_IMPORT int my_umask; /* Default creation mask */
extern int my_umask_dir, extern int my_umask_dir,

1
mysys/my_static.c
View File

@@ -72,7 +72,6 @@ ulong my_time_to_wait_for_lock=2; /* In seconds */
#ifdef SHARED_LIBRARY #ifdef SHARED_LIBRARY
const char *globerrs[GLOBERRS]; /* my_error_messages is here */ const char *globerrs[GLOBERRS]; /* my_error_messages is here */
#endif #endif
void (*my_abort_hook)(int) = (void(*)(int)) exit;
void (*error_handler_hook)(uint error, const char *str, myf MyFlags)= void (*error_handler_hook)(uint error, const char *str, myf MyFlags)=
my_message_stderr; my_message_stderr;
void (*fatal_error_handler_hook)(uint error, const char *str, myf MyFlags)= void (*fatal_error_handler_hook)(uint error, const char *str, myf MyFlags)=

2
plugin/daemon_example/daemon_example.cc
View File

@@ -129,7 +129,7 @@ static int daemon_example_plugin_init(void *p __attribute__ ((unused)))
(void *)con) != 0) (void *)con) != 0)
{ {
fprintf(stderr,"Could not create heartbeat thread!\n"); fprintf(stderr,"Could not create heartbeat thread!\n");
exit(0); DBUG_RETURN(1);
} }
plugin->data= (void *)con; plugin->data= (void *)con;

3
sql/init.cc
View File

@@ -42,9 +42,6 @@ void unireg_init(ulong options)
current_pid=(ulong) getpid(); /* Save for later ref */ current_pid=(ulong) getpid(); /* Save for later ref */
my_init_time(); /* Init time-functions (read zone) */ my_init_time(); /* Init time-functions (read zone) */
#ifndef EMBEDDED_LIBRARY
my_abort_hook=unireg_abort; /* Abort with close of databases */
#endif
(void) strmov(reg_ext,".frm"); (void) strmov(reg_ext,".frm");
reg_ext_length= 4; reg_ext_length= 4;