summaryrefslogtreecommitdiff
path: root/mysys/safemalloc.c
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-09-19 17:49:41 +0300
committermonty@mashka.mysql.fi <>2002-09-19 17:49:41 +0300
commitce4b584a8526fe8470cfc2187cd7b30e2b6a8a54 (patch)
tree897900b716e0af342d6a5a9d3c9f2bc23261dc72 /mysys/safemalloc.c
parentf638ee6df91a32ed767fa67cf643dfa07f9a82d4 (diff)
downloadmariadb-git-ce4b584a8526fe8470cfc2187cd7b30e2b6a8a54.tar.gz
Increased max possible max_allowed_packet to 1G
Small optimization to not do external locking of temporary MyISAM tables.
Diffstat (limited to 'mysys/safemalloc.c')
-rw-r--r--mysys/safemalloc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index f7e77878e41..2b990448b08 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.c
@@ -529,20 +529,20 @@ gptr _my_memdup(const byte *from, uint length, const char *sFile, uint uLine,
} /*_my_memdup */
-my_string _my_strdup(const char *from, const char *sFile, uint uLine,
- myf MyFlags)
+char *_my_strdup(const char *from, const char *sFile, uint uLine,
+ myf MyFlags)
{
gptr ptr;
uint length=(uint) strlen(from)+1;
if ((ptr=_mymalloc(length,sFile,uLine,MyFlags)) != 0)
memcpy((byte*) ptr, (byte*) from,(size_t) length);
- return((my_string) ptr);
+ return((char*) ptr);
} /* _my_strdup */
-my_string _my_strdup_with_length(const char *from, uint length,
- const char *sFile, uint uLine,
- myf MyFlags)
+char *_my_strdup_with_length(const byte *from, uint length,
+ const char *sFile, uint uLine,
+ myf MyFlags)
{
gptr ptr;
if ((ptr=_mymalloc(length+1,sFile,uLine,MyFlags)) != 0)
@@ -550,5 +550,5 @@ my_string _my_strdup_with_length(const char *from, uint length,
memcpy((byte*) ptr, (byte*) from,(size_t) length);
ptr[length]=0;
}
- return((my_string) ptr);
+ return((char *) ptr);
}