Skip to content

Commit 90ea014

Browse files
committed
MDEV-8378 - Debian: the Lintian complains about many "shlib-calls-exit" in many
of the plugins Removed exit() from daemon_example, pass error to caller instead. Also removed unused my_abort_hook.
1 parent 71eee69 commit 90ea014

File tree

4 files changed

+2
-7
lines changed

4 files changed

+2
-7
lines changed

include/my_sys.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,7 @@ extern myf my_global_flags; /* Set to MY_WME for more error messages
259259
/* Point to current my_message() */
260260
extern void (*my_sigtstp_cleanup)(void),
261261
/* Executed before jump to shell */
262-
(*my_sigtstp_restart)(void),
263-
(*my_abort_hook)(int);
262+
(*my_sigtstp_restart)(void);
264263
/* Executed when comming from shell */
265264
extern MYSQL_PLUGIN_IMPORT int my_umask; /* Default creation mask */
266265
extern int my_umask_dir,

mysys/my_static.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ ulong my_time_to_wait_for_lock=2; /* In seconds */
7272
#ifdef SHARED_LIBRARY
7373
const char *globerrs[GLOBERRS]; /* my_error_messages is here */
7474
#endif
75-
void (*my_abort_hook)(int) = (void(*)(int)) exit;
7675
void (*error_handler_hook)(uint error, const char *str, myf MyFlags)=
7776
my_message_stderr;
7877
void (*fatal_error_handler_hook)(uint error, const char *str, myf MyFlags)=

plugin/daemon_example/daemon_example.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ static int daemon_example_plugin_init(void *p __attribute__ ((unused)))
129129
(void *)con) != 0)
130130
{
131131
fprintf(stderr,"Could not create heartbeat thread!\n");
132-
exit(0);
132+
DBUG_RETURN(1);
133133
}
134134
plugin->data= (void *)con;
135135

sql/init.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ void unireg_init(ulong options)
4242

4343
current_pid=(ulong) getpid(); /* Save for later ref */
4444
my_init_time(); /* Init time-functions (read zone) */
45-
#ifndef EMBEDDED_LIBRARY
46-
my_abort_hook=unireg_abort; /* Abort with close of databases */
47-
#endif
4845

4946
(void) strmov(reg_ext,".frm");
5047
reg_ext_length= 4;

0 commit comments

Comments
 (0)