diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-08-20 20:46:26 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-08-20 20:46:26 +0500 |
| commit | 5e1a4fdb86f6c117dd1de86051de5dc23ace9112 (patch) | |
| tree | fb5fbb5549e399bb05cfc44e5d1b29b80562a318 /sql/log.cc | |
| parent | 22f6e6518ce1dd95386971197f9884e4c7e55c55 (diff) | |
| parent | 2b86ee9f0aa874065acf25094782e1e1f0f0f7b4 (diff) | |
| download | mariadb-git-5e1a4fdb86f6c117dd1de86051de5dc23ace9112.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-4.1.13717
into mysql.com:/home/hf/work/mysql-5.0-mrg
sql/log.cc:
Auto merged
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 7 |
1 files changed, 7 insertions, 0 deletions
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, ...) |