diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-19 21:48:08 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-19 21:48:08 -0200 |
| commit | ecb6228c623cc2b239bf297e107225eaa4455d19 (patch) | |
| tree | d21225ac09b301f317ca89093128769a5ede9fbb /sql/sql_string.cc | |
| parent | aaf2e7a0037a529070e4721c615b87566a31f09e (diff) | |
| parent | 9e27ce325013f706526c7b2240498baf4cae4735 (diff) | |
| download | mariadb-git-ecb6228c623cc2b239bf297e107225eaa4455d19.tar.gz | |
Manual merge of mysql-next-mr-runtime upstream.
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 593450cacd5..a0ea75a0b0a 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -23,6 +23,7 @@ #include <my_sys.h> #include <m_string.h> #include <m_ctype.h> +#include <mysql_com.h> #ifdef HAVE_FCONVERT #include <floatingpoint.h> #endif @@ -499,22 +500,6 @@ bool String::append(const char *s,uint32 arg_length, CHARSET_INFO *cs) return FALSE; } - -#ifdef TO_BE_REMOVED -bool String::append(FILE* file, uint32 arg_length, myf my_flags) -{ - if (realloc(str_length+arg_length)) - return TRUE; - if (my_fread(file, (uchar*) Ptr + str_length, arg_length, my_flags)) - { - shrink(str_length); - return TRUE; - } - str_length+=arg_length; - return FALSE; -} -#endif - bool String::append(IO_CACHE* file, uint32 arg_length) { if (realloc(str_length+arg_length)) |