Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2

into  production.mysql.com:/usersnfs/rburnett/mysql-5.1

libmysqld/libmysqld.def

@@ -164,3 +164,4 @@ EXPORTS
 	my_charset_bin
 	my_charset_same
 	modify_defaults_file
+        mysql_set_server_option

mysql-test/t/handler.test

+-- source include/not_embedded.inc
 #
 # test of HANDLER ...
 #

sql/log.cc

@@ -3968,7 +3968,13 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
     return an error (e.g. logging to the log tables)
 */
 
-int vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
+#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];
   uint length;
@@ -3984,6 +3990,7 @@ int vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
 
   DBUG_RETURN(0);
 }
+#endif /*EMBEDDED_LIBRARY*/
 
 
 void sql_print_error(const char *format, ...)