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 /include/my_sys.h | |
parent | 1788bfe93a745582d938a608d5959b7d2e6b2f23 (diff) | |
parent | 4fdf25afa8188905653a83e08fc387243e584600 (diff) | |
download | mariadb-git-a2bcee626d4ef2836e38e4932305871390164644.tar.gz |
Merge branch '10.0' into 10.1
Diffstat (limited to 'include/my_sys.h')
-rw-r--r-- | include/my_sys.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 9ae15db649c..36530eb94e9 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -267,8 +267,7 @@ extern myf my_global_flags; /* Set to MY_WME for more error messages /* Point to current my_message() */ extern void (*my_sigtstp_cleanup)(void), /* Executed before jump to shell */ - (*my_sigtstp_restart)(void), - (*my_abort_hook)(int); + (*my_sigtstp_restart)(void); /* Executed when comming from shell */ extern MYSQL_PLUGIN_IMPORT int my_umask; /* Default creation mask */ extern int my_umask_dir, |