diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-10-15 17:23:43 +0500 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-10-15 17:23:43 +0500 |
| commit | d8c3f2263f3deaadff957a0047460e8058cffccf (patch) | |
| tree | e38788d80d85437efb1819550af226f7b2e2c195 /include | |
| parent | 3929dddcd76130529cabfbd68cfff024e6b5c80d (diff) | |
| download | mariadb-git-d8c3f2263f3deaadff957a0047460e8058cffccf.tar.gz | |
WL#751 Error message construction, backport
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 3 | ||||
| -rw-r--r-- | include/my_sys.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index f6503a54935..700f373d677 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -477,6 +477,9 @@ uint my_charset_repertoire(CHARSET_INFO *cs); my_bool my_charset_is_ascii_compatible(CHARSET_INFO *cs); +extern size_t my_vsnprintf_ex(CHARSET_INFO *cs, char *to, size_t n, + const char* fmt, va_list ap); + #define _MY_U 01 /* Upper case */ #define _MY_L 02 /* Lower case */ #define _MY_NMR 04 /* Numeral (digit) */ diff --git a/include/my_sys.h b/include/my_sys.h index 34965ae9c67..c75863f454e 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -659,6 +659,7 @@ extern void my_osmaperr(unsigned long last_error); extern void TERMINATE(FILE *file, uint flag); #endif extern void init_glob_errs(void); +extern const char** get_global_errmsgs(); extern void wait_for_free_space(const char *filename, int errors); extern FILE *my_fopen(const char *FileName,int Flags,myf MyFlags); extern FILE *my_fdopen(File Filedes,const char *name, int Flags,myf MyFlags); @@ -672,7 +673,8 @@ extern void my_error _VARARGS((int nr,myf MyFlags, ...)); extern void my_printf_error _VARARGS((uint my_err, const char *format, myf MyFlags, ...)) ATTRIBUTE_FORMAT(printf, 2, 4); -extern int my_error_register(const char **errmsgs, int first, int last); +extern int my_error_register(const char** (*get_errmsgs) (), + int first, int last); extern const char **my_error_unregister(int first, int last); extern void my_message(uint my_err, const char *str,myf MyFlags); extern void my_message_no_curses(uint my_err, const char *str,myf MyFlags); |