diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-08-22 19:01:56 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-08-22 19:01:56 +0200 |
| commit | cb874dbd8186b324190840a400dc9890a5abd655 (patch) | |
| tree | edcd1856c92c00cad8157f2c081de9c8e488b715 | |
| parent | 808ee3feb3c5629b9ef5b0004e11ce1939651c9d (diff) | |
| parent | f73572d9d2a2756077e920431a60423b17c33750 (diff) | |
| download | mariadb-git-cb874dbd8186b324190840a400dc9890a5abd655.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
| -rw-r--r-- | libmysqld/libmysqld.def | 1 | ||||
| -rw-r--r-- | mysql-test/t/handler.test | 1 | ||||
| -rw-r--r-- | sql/log.cc | 7 |
3 files changed, 9 insertions, 0 deletions
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 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 ebd1d10d8b7..d67d77c8609 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, ...) |