summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/gen_lex_hash.cc2
-rw-r--r--sql/log.cc195
-rw-r--r--sql/mysql_priv.h11
-rw-r--r--sql/mysqld.cc10
-rw-r--r--sql/sql_base.cc11
5 files changed, 204 insertions, 25 deletions
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc
index 1f604659272..72ab1184533 100644
--- a/sql/gen_lex_hash.cc
+++ b/sql/gen_lex_hash.cc
@@ -384,7 +384,7 @@ static int get_options(int argc, char **argv)
{
int ho_error;
- if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
+ if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option, 0)))
exit(ho_error);
if (argc >= 1)
diff --git a/sql/log.cc b/sql/log.cc
index 2956efc047f..db7b80eb4f7 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -31,12 +31,51 @@
#include <m_ctype.h> // For test_if_number
#include <assert.h>
+#ifdef __NT__
+#include "message.h"
+#endif
+
MYSQL_LOG mysql_log,mysql_update_log,mysql_slow_log,mysql_bin_log;
extern I_List<i_string> binlog_do_db, binlog_ignore_db;
static bool test_if_number(const char *str,
long *res, bool allow_wildcards);
+#ifdef __NT__
+static int eventSource = 0;
+void setupWindowsEventSource()
+{
+ if (eventSource) return;
+
+ eventSource = 1;
+ HKEY hRegKey = NULL;
+ DWORD dwError = 0;
+ TCHAR szPath[ MAX_PATH ];
+
+ // Create the event source registry key
+ dwError = RegCreateKey( HKEY_LOCAL_MACHINE,
+ "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\MySQL",
+ &hRegKey );
+
+ // Name of the PE module that contains the message resource
+ GetModuleFileName( NULL, szPath, MAX_PATH );
+
+ // Register EventMessageFile
+ dwError = RegSetValueEx( hRegKey, "EventMessageFile", 0, REG_EXPAND_SZ,
+ (PBYTE) szPath, strlen(szPath)+1 );
+
+
+ // Register supported event types
+ DWORD dwTypes = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE;
+ dwError = RegSetValueEx( hRegKey, "TypesSupported", 0, REG_DWORD,
+ (LPBYTE) &dwTypes, sizeof dwTypes );
+
+ RegCloseKey( hRegKey );
+}
+
+#endif
+
+
/****************************************************************************
** Find a uniq filename for 'filename.#'.
** Set # to a number as low as possible
@@ -1693,41 +1732,33 @@ static bool test_if_number(register const char *str,
} /* test_if_number */
-void sql_print_error(const char *format,...)
+void print_buffer_to_file( enum loglevel level, const char *buffer )
{
- va_list args;
time_t skr;
struct tm tm_tmp;
struct tm *start;
- va_start(args,format);
- DBUG_ENTER("sql_print_error");
+
+ DBUG_ENTER("print_buffer_to_log");
VOID(pthread_mutex_lock(&LOCK_error_log));
-#ifndef DBUG_OFF
- {
- char buff[1024];
- my_vsnprintf(buff,sizeof(buff)-1,format,args);
- DBUG_PRINT("error",("%s",buff));
- va_end(args);
- va_start(args,format);
- }
-#endif
+
skr=time(NULL);
- localtime_r(&skr,&tm_tmp);
+ localtime_r(&skr, &tm_tmp);
start=&tm_tmp;
- fprintf(stderr,"%02d%02d%02d %2d:%02d:%02d ",
- start->tm_year % 100,
- start->tm_mon+1,
+ fprintf( stderr, "%02d%02d%02d %2d:%02d:%02d [%s] %s\n",
+ start->tm_year % 100,
+ start->tm_mon+1,
start->tm_mday,
start->tm_hour,
start->tm_min,
- start->tm_sec);
- (void) vfprintf(stderr,format,args);
- (void) fputc('\n',stderr);
+ start->tm_sec,
+ level == ERROR_LEVEL ? "ERROR" : level == WARNING_LEVEL ? "WARNING" : "INFORMATION",
+ buffer );
+
fflush(stderr);
- va_end(args);
VOID(pthread_mutex_unlock(&LOCK_error_log));
+
DBUG_VOID_RETURN;
}
@@ -1786,3 +1817,125 @@ bool flush_error_log()
}
return result;
}
+
+
+#ifdef __NT__
+void print_buffer_to_nt_eventlog( enum loglevel level, char *buff, int buffLen )
+{
+ HANDLE event;
+ char *buffptr;
+ LPCSTR *buffmsgptr;
+
+ DBUG_ENTER( "print_buffer_to_nt_eventlog" );
+
+ buffptr = buff;
+ if (strlen(buff) > (uint)(buffLen-4))
+ {
+ char *newBuff = new char[ strlen(buff) + 4 ];
+ strcpy( newBuff, buff );
+ buffptr = newBuff;
+ }
+ strcat( buffptr, "\r\n\r\n" );
+ buffmsgptr = (LPCSTR*)&buffptr;
+
+ setupWindowsEventSource();
+ if (event = RegisterEventSource(NULL,"MySQL"))
+ {
+ switch (level){
+ case ERROR_LEVEL:
+ ReportEvent(event, EVENTLOG_ERROR_TYPE, 0, MSG_DEFAULT, NULL, 1, 0, buffmsgptr, NULL);
+ break;
+ case WARNING_LEVEL:
+ ReportEvent(event, EVENTLOG_WARNING_TYPE, 0, MSG_DEFAULT, NULL, 1, 0, buffmsgptr, NULL);
+ break;
+ case INFORMATION_LEVEL:
+ ReportEvent(event, EVENTLOG_INFORMATION_TYPE, 0, MSG_DEFAULT, NULL, 1, 0, buffmsgptr, NULL);
+ break;
+ }
+ DeregisterEventSource(event);
+ }
+
+ // if we created a string buffer, then delete it
+ if ( buffptr != buff )
+ delete[] buffptr;
+
+
+ DBUG_VOID_RETURN;
+}
+#endif
+
+/*
+ Prints a printf style message to the error log and, under NT, to the Windows event log.
+
+ SYNOPSIS
+ vprint_msg_to_log()
+ event_type Type of event to write (Error, Warning, or Info)
+ format Printf style format of message
+ args va_list list of arguments for the message
+
+ NOTE
+
+ IMPLEMENTATION
+ This function prints the message into a buffer and then sends that buffer to other
+ functions to write that message to other logging sources.
+
+ RETURN VALUES
+ void
+*/
+void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
+{
+ char buff[1024];
+
+ DBUG_ENTER("vprint_msg_to_log");
+
+ my_vsnprintf( buff, sizeof(buff)-5, format, args );
+
+ print_buffer_to_file( level, buff );
+
+#ifndef DBUG_OFF
+ DBUG_PRINT("error",("%s",buff));
+#endif
+
+#ifdef __NT__
+ print_buffer_to_nt_eventlog( level, buff, sizeof(buff) );
+#endif
+
+ DBUG_VOID_RETURN;
+}
+
+
+void sql_print_error( const char *format, ... )
+{
+ DBUG_ENTER( "sql_print_error" );
+
+ va_list args;
+ va_start( args, format );
+ vprint_msg_to_log( ERROR_LEVEL, format, args );
+ va_end( args );
+
+ DBUG_VOID_RETURN;
+}
+
+void sql_print_warning( const char *format, ... )
+{
+ DBUG_ENTER( "sql_print_warning" );
+
+ va_list args;
+ va_start( args, format );
+ vprint_msg_to_log( WARNING_LEVEL, format, args );
+ va_end( args );
+
+ DBUG_VOID_RETURN;
+}
+
+void sql_print_information( const char *format, ... )
+{
+ DBUG_ENTER( "sql_print_information" );
+
+ va_list args;
+ va_start( args, format );
+ vprint_msg_to_log( INFORMATION_LEVEL, format, args );
+ va_end( args );
+
+ DBUG_VOID_RETURN;
+}
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index d70be1cb9f9..acc07eb6188 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,
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e20251adac4..8b10627b323 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5102,11 +5102,19 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
}
/* Initiates DEBUG - but no debugging here ! */
+void option_error_reporter( enum loglevel level, const char *format, ... )
+{
+ va_list args;
+ va_start( args, format );
+ vprint_msg_to_log( level, format, args );
+ va_end( args );
+}
+
static void get_options(int argc,char **argv)
{
int ho_error;
- if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
+ if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option, option_error_reporter )))
exit(ho_error);
#if defined(HAVE_BROKEN_REALPATH)
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 7b1b3cc1b7a..26ce394ec37 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2062,9 +2062,20 @@ bool
insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
const char *table_name, List_iterator<Item> *it)
{
+ char name_buff[NAME_LEN+1];
uint found;
DBUG_ENTER("insert_fields");
+
+ if (db_name && lower_case_table_names)
+ {
+ /* convert database to lower case for comparison */
+ strmake( name_buff, db_name, sizeof(name_buff)-1 );
+ casedn_str( name_buff );
+ db_name = name_buff;
+ }
+
+
found=0;
for (; tables ; tables=tables->next)
{
View Lorry Controller Status