diff options
| author | unknown <rburnett@build.mysql.com> | 2004-08-25 06:39:19 +0200 |
|---|---|---|
| committer | unknown <rburnett@build.mysql.com> | 2004-08-25 06:39:19 +0200 |
| commit | b15ee67874cf7abb683e122f2e78c4dffa9ff1b2 (patch) | |
| tree | 0cad8c896fbe9e4624de90e63fa1bc83d5b38203 /sql/mysql_priv.h | |
| parent | 73fe243d43067860295148ed6eac1f742d16de26 (diff) | |
| parent | f2ef3d162eaf16bac68b7bc602be83cc7acf4f74 (diff) | |
| download | mariadb-git-b15ee67874cf7abb683e122f2e78c4dffa9ff1b2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index f53e14878b0..9d6b44f440f 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -24,6 +24,7 @@ #include <thr_lock.h> #include <my_base.h> /* Needed by field.h */ #include <my_bitmap.h> +#include <my_getopt.h> #ifdef __EMX__ #undef write /* remove pthread.h macro definition for EMX */ @@ -640,8 +641,14 @@ bool check_if_key_used(TABLE *table, uint idx, List<Item> &fields); void init_errmessage(void); void sql_perror(const char *message); -void sql_print_error(const char *format,...) - __attribute__ ((format (printf, 1, 2))); + +void vprint_msg_to_log( enum loglevel level, const char *format, va_list args ); +void sql_print_error( const char *format, ... ); +void sql_print_warning( const char *format, ...); +void sql_print_information( const char *format, ...); + + + bool fn_format_relative_to_data_home(my_string to, const char *name, const char *dir, const char *extension); bool open_log(MYSQL_LOG *log, const char *hostname, |