summaryrefslogtreecommitdiff
path: root/mysys/safemalloc.c
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-09-19 17:49:41 +0300
committerunknown <monty@mashka.mysql.fi>2002-09-19 17:49:41 +0300
commita355b6ac7040d0e9540c7d8396d0b1b315a7aa0d (patch)
tree897900b716e0af342d6a5a9d3c9f2bc23261dc72 /mysys/safemalloc.c
parent83fc12f21653f1e6fc12c61791f4e6f2dd87be96 (diff)
downloadmariadb-git-a355b6ac7040d0e9540c7d8396d0b1b315a7aa0d.tar.gz
Increased max possible max_allowed_packet to 1G
Small optimization to not do external locking of temporary MyISAM tables. BitKeeper/deleted/.del-sslopt-usage.h~3ab77eeeaad1ba0a: Delete: include/sslopt-usage.h Docs/manual.texi: Fixed wrong descrtion of IF() Added information about automatic cast of integer to binary string ChangeLog client/mysqlbinlog.cc: Portability fix client/mysqldump.c: Increased max possible max_allowed_packet to 1G include/Makefile.am: Removed sslopt-usage.h Made sslopt-case.h global include/my_sys.h: Fixd protypes for my_strdup_with_length() mysys/safemalloc.c: Fixd some prototypes sql/ha_isam.cc: Don't do external locking on temporary tables sql/ha_myisam.cc: Don't do external locking on temporary tables sql/lock.cc: Added big description of how LOCK TABLES affects locking sql/log_event.cc: cleanup sql/mysqld.cc: Increased max possible max_allowed_packet to 1G sql/sql_table.cc: Fixed portability problem
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);
}