summaryrefslogtreecommitdiff
path: root/mysys/safemalloc.c
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2006-06-27 14:56:24 +0400
committerunknown <konstantin@mysql.com>2006-06-27 14:56:24 +0400
commite3ef15ea37dbbd0e999fa7f3fb0ca7bddc4a11cf (patch)
treeab6cc503abd315c5b2523995d5b6a0392fa16cc2 /mysys/safemalloc.c
parent25652349e9519d85e6df1953050d3f2351225b1d (diff)
downloadmariadb-git-e3ef15ea37dbbd0e999fa7f3fb0ca7bddc4a11cf.tar.gz
Fix compilation failures on Windows caused by the patch for Bug#17199.
Fix a minor issue with Bug#16206 (bdb.test failed if the tree is compiled without blackhole). include/my_sys.h: Change declaration of my_strdup_with_length to accept const char *, not const byte *: in 5 places out of 6 where this function is used, it's being passed char *, not byte * mysql-test/r/bdb.result: Remove dependency on an optional engine (updated test results). mysql-test/t/bdb.test: Remove dependency on an optional engine. mysys/my_malloc.c: my_strdup_with_length: const byte * -> const char * mysys/safemalloc.c: my_strdup_with_length: const byte * -> const char * sql/ha_federated.cc: my_strdup_with_length: const byte * -> const char * sql/log_event.cc: my_strdup_with_length: const byte * -> const char * sql/set_var.cc: my_strdup_with_length: const byte * -> const char * sql/sql_class.h: Change db_length type to uint from uint32 (see also table.h) sql/table.h: Change the type of db_length to uint from uint32: LEX_STRING uses uint for length, we need a small and consistent set of types to store length to minimize cast and compile failures.
Diffstat (limited to 'mysys/safemalloc.c')
-rw-r--r--mysys/safemalloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index 6cdf98c5f5f..f6d6644859e 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.c
@@ -525,7 +525,7 @@ char *_my_strdup(const char *from, const char *filename, uint lineno,
} /* _my_strdup */
-char *_my_strdup_with_length(const byte *from, uint length,
+char *_my_strdup_with_length(const char *from, uint length,
const char *filename, uint lineno,
myf MyFlags)
{