diff options
Diffstat (limited to 'mysys/my_error.c')
| -rw-r--r-- | mysys/my_error.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mysys/my_error.c b/mysys/my_error.c index e8fd8b938ee..d26c3d8cfde 100644 --- a/mysys/my_error.c +++ b/mysys/my_error.c @@ -84,19 +84,14 @@ int my_error(int nr, myf MyFlags, ...) if (nr <= meh_p->meh_last) break; -#ifdef SHARED_LIBRARY - if ((meh_p == &my_errmsgs_globerrs) && ! globerrs[0]) - init_glob_errs(); -#endif - /* get the error message string. Default, if NULL or empty string (""). */ if (! (format= (meh_p && (nr >= meh_p->meh_first)) ? meh_p->meh_errmsgs[nr - meh_p->meh_first] : NULL) || ! *format) - (void) my_snprintf (ebuff, sizeof(ebuff), "Unknown error %d", nr); + (void) my_snprintf(ebuff, sizeof(ebuff), "Unknown error %d", nr); else { va_start(args,MyFlags); - (void) my_vsnprintf (ebuff, sizeof(ebuff), format, args); + (void) my_vsnprintf(ebuff, sizeof(ebuff), format, args); va_end(args); } DBUG_RETURN((*error_handler_hook)(nr, ebuff, MyFlags)); |