diff options
| author | Alexander Barkov <bar@mysql.com> | 2009-10-21 15:48:22 +0500 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2009-10-21 15:48:22 +0500 |
| commit | dcb8bb23c29172949781f5214b8222505752de70 (patch) | |
| tree | d2522e7182d47f0be16e18e95d3830f7ff496ce0 /include/my_sys.h | |
| parent | 52701ff3277d6641994e6b76d84bb5903af48d59 (diff) | |
| parent | de7d1abe9386c2e9df1a8c5f3b95f3cd57cc6c9f (diff) | |
| download | mariadb-git-dcb8bb23c29172949781f5214b8222505752de70.tar.gz | |
Merging mysql-next-mr-merge to mysql-next-mr.
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index c0a15bc2743..320b7e94467 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -241,8 +241,9 @@ extern uint my_large_page_size; #endif /* charsets */ +#define MY_ALL_CHARSETS_SIZE 2048 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info; -extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[256]; +extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *all_charsets[MY_ALL_CHARSETS_SIZE]; extern CHARSET_INFO compiled_charsets[]; /* statistics */ @@ -668,6 +669,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); @@ -681,7 +683,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); |