diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-09-24 12:35:16 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-09-24 12:35:16 +0200 |
| commit | 626bac84719e8c30890e22806c1075f64b34ed5b (patch) | |
| tree | 0718249009da3fd00d987bef459d1617571e454e /mysys/my_static.c | |
| parent | 2b2ef99ebf63634d6da81f27aa2ee94e09e5b197 (diff) | |
| parent | b0220ff9ff6fbc9fc65a9b04f25e337951edd259 (diff) | |
| download | mariadb-git-626bac84719e8c30890e22806c1075f64b34ed5b.tar.gz | |
merge mysql-next-mr-alik
Diffstat (limited to 'mysys/my_static.c')
| -rw-r--r-- | mysys/my_static.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c index 1ddf3524052..14f04491430 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (C) 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -87,9 +87,9 @@ ulong my_time_to_wait_for_lock=2; /* In seconds */ char * NEAR globerrs[GLOBERRS]; /* my_error_messages is here */ #endif void (*my_abort_hook)(int) = (void(*)(int)) exit; -int (*error_handler_hook)(uint error,const char *str,myf MyFlags)= +void (*error_handler_hook)(uint error,const char *str,myf MyFlags)= my_message_no_curses; -int (*fatal_error_handler_hook)(uint error,const char *str,myf MyFlags)= +void (*fatal_error_handler_hook)(uint error,const char *str,myf MyFlags)= my_message_no_curses; #ifdef __WIN__ |