diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-10 18:51:14 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-10 18:51:14 -0200 |
| commit | 891dffa32293a1700bb940f55825488d86915010 (patch) | |
| tree | 652aaaef83362a67f4c94978258609bace065b8f /sql/sql_string.cc | |
| parent | ff847056319f41cd8b6c70833ec3647146d12c72 (diff) | |
| download | mariadb-git-891dffa32293a1700bb940f55825488d86915010.tar.gz | |
Backport of Bug#45767 to mysql-next-mr
------------------------------------------------------------
revno: 3405
revision-id: davi.arnaut@sun.com-20090626124624-m4wolyo5193j4cu7
parent: luis.soares@sun.com-20090626113019-1j4mn1jos480u9f3
committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
branch nick: mysql-pe
timestamp: Fri 2009-06-26 09:46:24 -0300
message:
Bug#45767: deprecate/remove Field::pack_key, Field::unpack_key, Field::pack_cmp
Remove unused and dead code.
Parts of the patch contributed by Zardosht Kasheff
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 593450cacd5..491e51e8a92 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -499,22 +499,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)) |