From e3ef15ea37dbbd0e999fa7f3fb0ca7bddc4a11cf Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 27 Jun 2006 14:56:24 +0400 Subject: 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. --- sql/ha_federated.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sql/ha_federated.cc') diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index c6d5c77803b..02bcde43f11 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -632,8 +632,7 @@ static int parse_url(FEDERATED_SHARE *share, TABLE *table, DBUG_PRINT("info", ("Length %d \n", table->s->connect_string.length)); DBUG_PRINT("info", ("String %.*s \n", table->s->connect_string.length, table->s->connect_string.str)); - share->scheme= my_strdup_with_length((const byte*)table->s-> - connect_string.str, + share->scheme= my_strdup_with_length(table->s->connect_string.str, table->s->connect_string.length, MYF(0)); -- cgit v1.2.1