From 43181777c19badfbe8a5c5f3cf3fde560fa0a297 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 25 Jul 2006 18:02:42 +0500 Subject: [PATCH 1/3] Bug #15440 (handler.test hangs in embedded mode) the old problem - mysqltest can't handle multiple connections in the embedded server properly. So i disabled the test for the embedded mode until mysqltest is fixed mysql-test/t/handler.test: test temporarily disabled in embedded server --- mysql-test/t/handler.test | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/t/handler.test b/mysql-test/t/handler.test index a78800d3d5a..55936e44b32 100644 --- a/mysql-test/t/handler.test +++ b/mysql-test/t/handler.test @@ -1,3 +1,4 @@ +-- source include/not_embedded.inc # # test of HANDLER ... # From 2b86ee9f0aa874065acf25094782e1e1f0f0f7b4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Aug 2006 15:18:21 +0500 Subject: [PATCH 2/3] bug #13717 embedded library dumps warnings on STDERR directly Here i just disabled STDERR warnings in embedded server Later we should get more defined about logs in the embedded server sql/log.cc: Log messages muted in embedded server --- sql/log.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sql/log.cc b/sql/log.cc index c530f15a84f..78605de3141 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -2321,6 +2321,12 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff, void */ +#ifdef EMBEDDED_LIBRARY +void vprint_msg_to_log(enum loglevel level __attribute__((unused)), + const char *format __attribute__((unused)), + va_list argsi __attribute__((unused))) +{} +#else /*!EMBEDDED_LIBRARY*/ void vprint_msg_to_log(enum loglevel level, const char *format, va_list args) { char buff[1024]; @@ -2336,6 +2342,7 @@ void vprint_msg_to_log(enum loglevel level, const char *format, va_list args) DBUG_VOID_RETURN; } +#endif /*EMBEDDED_LIBRARY*/ void sql_print_error(const char *format, ...) From 22f6e6518ce1dd95386971197f9884e4c7e55c55 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 19 Aug 2006 15:15:36 +0500 Subject: [PATCH 3/3] bug #16513 (no mysql_set_server_option in libmysqld.dll export) libmysqld/libmysqld.def: mysql_set_server_option added to libmysqld.dll export --- libmysqld/libmysqld.def | 1 + 1 file changed, 1 insertion(+) diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def index 3895588e02c..0e80681700f 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -163,3 +163,4 @@ EXPORTS my_charset_bin my_charset_same modify_defaults_file + mysql_set_server_option