summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-08-24 12:57:19 +0200
committerunknown <knielsen@knielsen-hq.org>2012-08-24 12:57:19 +0200
commit89e4d23f3b3984abe0f29adb8c024a105d3b5d49 (patch)
tree854aecb31ad17de61cf4eef1cad3d6d19211a33d /include
parent1fd8150a5b5e3f56aa3c253225929a07ee9a4026 (diff)
parent96703a63da2211cefcc480fa4f135acd94743622 (diff)
downloadmariadb-git-89e4d23f3b3984abe0f29adb8c024a105d3b5d49.tar.gz
Merge into latest 5.2.
Diffstat (limited to 'include')
-rw-r--r--include/my_sys.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index 30b7e0262da..0c1ea1ae2d1 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -676,6 +676,7 @@ extern FILE *my_fopen(const char *FileName,int Flags,myf MyFlags);
extern FILE *my_fdopen(File Filedes,const char *name, int Flags,myf MyFlags);
extern FILE *my_freopen(const char *path, const char *mode, FILE *stream);
extern int my_fclose(FILE *fd,myf MyFlags);
+extern int my_fprintf(FILE *stream, const char* format, ...);
extern int my_chsize(File fd,my_off_t newlength, int filler, myf MyFlags);
extern int my_chmod(const char *name, mode_t mode, myf my_flags);
extern int my_sync(File fd, myf my_flags);
@@ -811,6 +812,8 @@ extern size_t my_b_fill(IO_CACHE *info);
extern void my_b_seek(IO_CACHE *info,my_off_t pos);
extern size_t my_b_gets(IO_CACHE *info, char *to, size_t max_length);
extern my_off_t my_b_filelength(IO_CACHE *info);
+extern size_t my_b_write_backtick_quote(IO_CACHE *info, const char *str,
+ size_t len);
extern size_t my_b_printf(IO_CACHE *info, const char* fmt, ...);
extern size_t my_b_vprintf(IO_CACHE *info, const char* fmt, va_list ap);
extern int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,