summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2004-05-14 12:26:12 +0300
committerunknown <marko@hundin.mysql.fi>2004-05-14 12:26:12 +0300
commit2d743fe227f469c0dbaba803e818b4e23a3e2a76 (patch)
treeaaf9fe24c0e23ef3656f646dd102e498bbda6b83 /innobase
parentae17c3c712695388f93faa4e5f9baca1163f653d (diff)
downloadmariadb-git-2d743fe227f469c0dbaba803e818b4e23a3e2a76.tar.gz
InnoDB: Remove unused function ut_str_catenate()
innobase/include/ut0mem.h: Remove unused function ut_str_catenate() innobase/ut/ut0mem.c: Remove unused function ut_str_catenate()
Diffstat (limited to 'innobase')
-rw-r--r--innobase/include/ut0mem.h11
-rw-r--r--innobase/ut/ut0mem.c26
2 files changed, 0 insertions, 37 deletions
diff --git a/innobase/include/ut0mem.h b/innobase/include/ut0mem.h
index bfda5ded40c..e83b2e6f60c 100644
--- a/innobase/include/ut0mem.h
+++ b/innobase/include/ut0mem.h
@@ -108,17 +108,6 @@ ut_memcpyq(
const char* src, /* in: string to be quoted */
ulint len); /* in: length of src */
-/**************************************************************************
-Catenates two strings into newly allocated memory. The memory must be freed
-using mem_free. */
-
-char*
-ut_str_catenate(
-/*============*/
- /* out, own: catenated null-terminated string */
- char* str1, /* in: null-terminated string */
- char* str2); /* in: null-terminated string */
-
#ifndef UNIV_NONINL
#include "ut0mem.ic"
#endif
diff --git a/innobase/ut/ut0mem.c b/innobase/ut/ut0mem.c
index 1fcaf9febbe..13846630818 100644
--- a/innobase/ut/ut0mem.c
+++ b/innobase/ut/ut0mem.c
@@ -236,29 +236,3 @@ ut_memcpyq(
return(dest);
}
-
-/**************************************************************************
-Catenates two strings into newly allocated memory. The memory must be freed
-using mem_free. */
-
-char*
-ut_str_catenate(
-/*============*/
- /* out, own: catenated null-terminated string */
- char* str1, /* in: null-terminated string */
- char* str2) /* in: null-terminated string */
-{
- ulint len1;
- ulint len2;
- char* str;
-
- len1 = ut_strlen(str1);
- len2 = ut_strlen(str2);
-
- str = mem_alloc(len1 + len2 + 1);
-
- ut_memcpy(str, str1, len1);
- ut_memcpy(str + len1, str2, len2 + 1);
-
- return(str);
-}