diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-12-11 12:39:38 +0300 |
commit | 69cfd5c8ecd20bca0e651efcbb8b5affc24c1af4 (patch) | |
tree | 965519a5b0af3f33624c7e16fd61b58d15f42372 /server-tools/instance-manager/log.h | |
parent | 713ed2d2438dd0e5aecf8ea5138d0ca97c3bc519 (diff) | |
parent | 2757eab5444982e9375f77d9bca52992f55cc565 (diff) | |
download | mariadb-git-69cfd5c8ecd20bca0e651efcbb8b5affc24c1af4.tar.gz |
Manual merge from mysql-trunk.
Conflicts:
- client/mysqltest.cc
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/t/disabled.def
- sql/mysqld.cc
- sql/opt_range.cc
- sql/sp.cc
- sql/sql_acl.cc
- sql/sql_partition.cc
- sql/sql_table.cc
Diffstat (limited to 'server-tools/instance-manager/log.h')
-rw-r--r-- | server-tools/instance-manager/log.h | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/server-tools/instance-manager/log.h b/server-tools/instance-manager/log.h deleted file mode 100644 index e6c3b55c54c..00000000000 --- a/server-tools/instance-manager/log.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright (C) 2003-2006 MySQL AB - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_LOG_H -#define INCLUDES_MYSQL_INSTANCE_MANAGER_LOG_H - -/* - Logging facilities. - - Two logging streams are supported: error log and info log. - Additionally libdbug may be used for debug information output. - - ANSI C buffered I/O is used to perform logging. - - Logging is performed via stdout/stder, so one can reopen them to point to - ordinary files. To initialize logging environment log_init() must be called. - - Rationale: - - no MYSQL_LOG as it has BIN mode, and not easy to fetch from sql_class.h - - no constructors/desctructors to make logging available all the time -*/ - - -void log_init(); - - -void log_info(const char *format, ...) -#ifdef __GNUC__ - __attribute__ ((format(printf, 1, 2))) -#endif - ; - - -void log_error(const char *format, ...) -#ifdef __GNUC__ - __attribute__ ((format (printf, 1, 2))) -#endif - ; - - -void die(const char *format, ...) -#ifdef __GNUC__ - __attribute__ ((format (printf, 1, 2))) -#endif - ; - -#endif // INCLUDES_MYSQL_INSTANCE_MANAGER_LOG_H |