merge

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/sql_string.h b/sql/sql_string.h
index 1c9e822cce5..f327618ffdd 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -152,7 +152,7 @@ public:
   bool copy(const char *s,uint32 arg_length);	// Allocate new string
   bool append(const String &s);
   bool append(const char *s,uint32 arg_length=0);
-  bool append(FILE* file, uint32 arg_length, myf my_flags);
+  bool append(IO_CACHE* file, uint32 arg_length);
   int strstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
   int strrstr(const String &search,uint32 offset=0); // Returns offset to substring or -1
   bool replace(uint32 offset,uint32 arg_length,const String &to);