mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
changed to use IO_CACHE instead of FILE
BitKeeper/deleted/.del-mf_reccache.c: ***MISSING WEAVE*** Docs/manual.texi: Fix licence information + update changelog client/mysqlimport.c: Fixed typo client/sql_string.cc: Added support for IO_CACHE client/sql_string.h: Added support for IO_CACHE include/my_sys.h: More options for IO_CACHE mysql.proj: Update mysys/Makefile.am: Remoced mf_reccache.c mysys/mf_cache.c: Fixed return value on error and optimzed used of write cache files mysys/mf_iocache.c: More options for IO_CACHE mysys/my_vsnprintf.c: Optimized code sql/mf_iocache.cc: merge with mf_iocache.c sql/net_pkg.cc: cleanup sql/sql_class.cc: Support for transaction safe log files sql/sql_string.cc: Added support for IO_CACHE sql/sql_string.h: Added support for IO_CACHE sql/time.cc: cleanup BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
This commit is contained in:
@ -95,17 +95,6 @@ bool String::realloc(uint32 alloc_length)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
#ifdef NOT_NEEDED
|
||||
bool String::set(long num)
|
||||
{
|
||||
if (alloc(14))
|
||||
return TRUE;
|
||||
str_length=(uint32) (int10_to_str(num,Ptr,-10)-Ptr);
|
||||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
bool String::set(longlong num)
|
||||
{
|
||||
if (alloc(21))
|
||||
@ -274,6 +263,7 @@ bool String::append(const char *s,uint32 arg_length)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#ifdef TO_BE_REMOVED
|
||||
bool String::append(FILE* file, uint32 arg_length, myf my_flags)
|
||||
{
|
||||
if (realloc(str_length+arg_length))
|
||||
@ -286,6 +276,20 @@ bool String::append(FILE* file, uint32 arg_length, myf my_flags)
|
||||
str_length+=arg_length;
|
||||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
bool String::append(IO_CACHE* file, uint32 arg_length)
|
||||
{
|
||||
if (realloc(str_length+arg_length))
|
||||
return TRUE;
|
||||
if (my_b_read(file, (byte*) Ptr + str_length, arg_length))
|
||||
{
|
||||
shrink(str_length);
|
||||
return TRUE;
|
||||
}
|
||||
str_length+=arg_length;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
uint32 String::numchars()
|
||||
{
|
||||
|
Reference in New Issue
Block a user