diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def
index 3895588e02c40960fc31601d3df8388f14b8885c..0e80681700f40b55779cfdce70d094c6d3bccfae 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
diff --git a/mysql-test/t/handler.test b/mysql-test/t/handler.test
index a7f1eeaa2cc7a3747a76189a6768086b70f6f23f..bf18b8da941b81e36b5a1978de9caab74fcd1a62 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 ...
 #
diff --git a/sql/log.cc b/sql/log.cc
index ebd1d10d8b7c17dc91cdcd0994917725a1807420..d67d77c8609071a6b437b5942ce63f2079c4ab09 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2385,6 +2385,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];
@@ -2400,6 +2406,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, ...)