diff options
| author | hf@deer.mysql.r18.ru <> | 2003-01-15 13:15:35 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2003-01-15 13:15:35 +0400 |
| commit | 96089e2b3a013c83e812672284bf10a34ba9d11c (patch) | |
| tree | 937beb6f27e5e7958081a4a5ba13ceb2f5251396 /include/my_sys.h | |
| parent | c59bff7c96bf90c9c4dafdb80684fb438bb43734 (diff) | |
| parent | 809af00b0672242cc1b0fee114a34f414ec9055a (diff) | |
| download | mariadb-git-96089e2b3a013c83e812672284bf10a34ba9d11c.tar.gz | |
resolving conflicts
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index ab5dedc0ba1..3d81a9e9219 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -206,6 +206,7 @@ extern const char *get_charset_name(uint cs_number); extern CHARSET_INFO *get_charset(uint cs_number, myf flags); extern my_bool set_default_charset(uint cs, myf flags); extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags); +extern CHARSET_INFO *get_charset_by_csname(const char *cs_name, myf flags); extern my_bool set_default_charset_by_name(const char *cs_name, myf flags); extern void free_charsets(void); extern char *list_charsets(myf want_flags); /* my_free() this string... */ @@ -505,6 +506,8 @@ extern int my_setwd(const char *dir,myf MyFlags); extern int my_lock(File fd,int op,my_off_t start, my_off_t length,myf MyFlags); extern gptr my_once_alloc(uint Size,myf MyFlags); extern void my_once_free(void); +extern char *my_once_strdup(const char *src,myf myflags); +extern char *my_once_memdup(const char *src, uint len, myf myflags); extern my_string my_tempnam(const char *dir,const char *pfx,myf MyFlags); extern File my_open(const char *FileName,int Flags,myf MyFlags); extern File my_register_filename(File fd, const char *FileName, @@ -566,9 +569,6 @@ extern int my_error _VARARGS((int nr,myf MyFlags, ...)); extern int my_printf_error _VARARGS((uint my_err, const char *format, myf MyFlags, ...) __attribute__ ((format (printf, 2, 4)))); -extern int my_vsnprintf( char *str, size_t n, - const char *format, va_list ap ); -extern int my_snprintf(char* to, size_t n, const char* fmt, ...); extern int my_message(uint my_err, const char *str,myf MyFlags); extern int my_message_no_curses(uint my_err, const char *str,myf MyFlags); extern int my_message_curses(uint my_err, const char *str,myf MyFlags); |