diff options
| author | rburnett@production.mysql.com <> | 2006-09-06 18:27:26 +0200 |
|---|---|---|
| committer | rburnett@production.mysql.com <> | 2006-09-06 18:27:26 +0200 |
| commit | 926d98d97355ba46a6af91e1f6edcfeff4e8261c (patch) | |
| tree | 08399387f35eaea892ae7b84bed1e8a045d78d0e | |
| parent | e51935b3631217098500a9bbb0e96d575b3ace09 (diff) | |
| parent | 001aaedddcd22cddc10bfc6f6e2f43d028c7f1ac (diff) | |
| download | mariadb-git-926d98d97355ba46a6af91e1f6edcfeff4e8261c.tar.gz | |
Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2
into production.mysql.com:/usersnfs/rburnett/mysql-5.1
| -rw-r--r-- | libmysqld/libmysqld.def | 1 | ||||
| -rw-r--r-- | mysql-test/t/handler.test | 1 | ||||
| -rw-r--r-- | sql/log.cc | 9 |
3 files changed, 10 insertions, 1 deletions
diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def index 0d7eae9cade..6f7800ee207 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -164,3 +164,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 a7f1eeaa2cc..bf18b8da941 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 1bc7ff4f01e..93f345c8ee9 100644 --- a/sql/log.cc +++ b/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, ...) |