mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
e55c4836a1
Implement os_event_wait_time() for POSIX systems. In the purge thread, use os_event_wait_time() when sleeping rather than sleep, and signal the event when server shuts down, so we do not need to wait for upto 10 seconds until the purge thread wakes up. Also fix bug that warnings that were pushed after we call set_ok_status() were not included in the waning count sent to the client in the result packet. Also in mysqltest, in recursive die() invocation at least print the message before aborting. client/mysqltest.cc: If we detect recursive die(), at least print the message before aborting. mysql-test/r/warnings_debug.result: Test case. mysql-test/t/warnings_debug.test: Test case. sql/handler.cc: Force generation of a warning with specific debug option, for testing. sql/protocol.cc: Fix wrong DBUG_ENTER sql/sql_class.h: Add method to count warnings pushed after set_ok_status() is called. sql/sql_error.cc: Also count warnings pushed after set_ok_status() is called. storage/xtradb/include/os0sync.h: Implement working os_sync_wait_time() for POSIX. storage/xtradb/include/srv0srv.h: Make the purge thread wait for an event when sleeping, so we can signal it to wakeup immediately at shutdown. storage/xtradb/log/log0log.c: Make the purge thread wait for an event when sleeping, so we can signal it to wakeup immediately at shutdown. storage/xtradb/os/os0sync.c: Implement working os_sync_wait_time() for POSIX. storage/xtradb/srv/srv0srv.c: Make the purge thread wait for an event when sleeping, so we can signal it to wakeup immediately at shutdown.
262 lines
7.5 KiB
C++
262 lines
7.5 KiB
C++
/* Copyright (C) 1995-2002 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 */
|
|
|
|
/**********************************************************************
|
|
This file contains the implementation of error and warnings related
|
|
|
|
- Whenever an error or warning occurred, it pushes it to a warning list
|
|
that the user can retrieve with SHOW WARNINGS or SHOW ERRORS.
|
|
|
|
- For each statement, we return the number of warnings generated from this
|
|
command. Note that this can be different from @@warning_count as
|
|
we reset the warning list only for questions that uses a table.
|
|
This is done to allow on to do:
|
|
INSERT ...;
|
|
SELECT @@warning_count;
|
|
SHOW WARNINGS;
|
|
(If we would reset after each command, we could not retrieve the number
|
|
of warnings)
|
|
|
|
- When client requests the information using SHOW command, then
|
|
server processes from this list and returns back in the form of
|
|
resultset.
|
|
|
|
Supported syntaxes:
|
|
|
|
SHOW [COUNT(*)] ERRORS [LIMIT [offset,] rows]
|
|
SHOW [COUNT(*)] WARNINGS [LIMIT [offset,] rows]
|
|
SELECT @@warning_count, @@error_count;
|
|
|
|
***********************************************************************/
|
|
|
|
#include "mysql_priv.h"
|
|
#include "sp_rcontext.h"
|
|
|
|
/*
|
|
Store a new message in an error object
|
|
|
|
This is used to in group_concat() to register how many warnings we actually
|
|
got after the query has been executed.
|
|
*/
|
|
|
|
void MYSQL_ERROR::set_msg(THD *thd, const char *msg_arg)
|
|
{
|
|
msg= strdup_root(&thd->warn_root, msg_arg);
|
|
}
|
|
|
|
|
|
/*
|
|
Reset all warnings for the thread
|
|
|
|
SYNOPSIS
|
|
mysql_reset_errors()
|
|
thd Thread handle
|
|
force Reset warnings even if it has been done before
|
|
|
|
IMPLEMENTATION
|
|
Don't reset warnings if this has already been called for this query.
|
|
This may happen if one gets a warning during the parsing stage,
|
|
in which case push_warnings() has already called this function.
|
|
*/
|
|
|
|
void mysql_reset_errors(THD *thd, bool force)
|
|
{
|
|
DBUG_ENTER("mysql_reset_errors");
|
|
if (thd->query_id != thd->warn_id || force)
|
|
{
|
|
thd->warn_id= thd->query_id;
|
|
free_root(&thd->warn_root,MYF(0));
|
|
bzero((char*) thd->warn_count, sizeof(thd->warn_count));
|
|
if (force)
|
|
thd->total_warn_count= 0;
|
|
thd->warn_list.empty();
|
|
thd->row_count= 1; // by default point to row 1
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
Push the warning/error to error list if there is still room in the list
|
|
|
|
SYNOPSIS
|
|
push_warning()
|
|
thd Thread handle
|
|
level Severity of warning (note, warning, error ...)
|
|
code Error number
|
|
msg Clear error message
|
|
|
|
RETURN
|
|
pointer on MYSQL_ERROR object
|
|
*/
|
|
|
|
MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
|
|
uint code, const char *msg)
|
|
{
|
|
MYSQL_ERROR *err= 0;
|
|
DBUG_ENTER("push_warning");
|
|
DBUG_PRINT("enter", ("code: %d, msg: %s", code, msg));
|
|
|
|
DBUG_ASSERT(code != 0);
|
|
DBUG_ASSERT(msg != NULL);
|
|
|
|
if (level == MYSQL_ERROR::WARN_LEVEL_NOTE &&
|
|
!(thd->options & OPTION_SQL_NOTES))
|
|
DBUG_RETURN(0);
|
|
|
|
if (thd->query_id != thd->warn_id && !thd->spcont)
|
|
mysql_reset_errors(thd, 0);
|
|
thd->got_warning= 1;
|
|
|
|
/* Abort if we are using strict mode and we are not using IGNORE */
|
|
if ((int) level >= (int) MYSQL_ERROR::WARN_LEVEL_WARN &&
|
|
thd->really_abort_on_warning())
|
|
{
|
|
/* Avoid my_message() calling push_warning */
|
|
bool no_warnings_for_error= thd->no_warnings_for_error;
|
|
sp_rcontext *spcont= thd->spcont;
|
|
|
|
thd->no_warnings_for_error= 1;
|
|
thd->spcont= NULL;
|
|
|
|
thd->killed= THD::KILL_BAD_DATA;
|
|
my_message(code, msg, MYF(0));
|
|
|
|
thd->spcont= spcont;
|
|
thd->no_warnings_for_error= no_warnings_for_error;
|
|
/* Store error in error list (as my_message() didn't do it) */
|
|
level= MYSQL_ERROR::WARN_LEVEL_ERROR;
|
|
}
|
|
|
|
if (thd->handle_error(code, msg, level))
|
|
DBUG_RETURN(NULL);
|
|
|
|
if (thd->spcont &&
|
|
thd->spcont->handle_error(code, level, thd))
|
|
{
|
|
DBUG_RETURN(NULL);
|
|
}
|
|
query_cache_abort(&thd->net);
|
|
|
|
|
|
if (thd->warn_list.elements < thd->variables.max_error_count)
|
|
{
|
|
/* We have to use warn_root, as mem_root is freed after each query */
|
|
if ((err= new (&thd->warn_root) MYSQL_ERROR(thd, code, level, msg)))
|
|
thd->warn_list.push_back(err, &thd->warn_root);
|
|
}
|
|
thd->warn_count[(uint) level]++;
|
|
thd->total_warn_count++;
|
|
/* Make sure we also count warnings pushed after calling set_ok_status(). */
|
|
thd->main_da.increment_warning();
|
|
DBUG_RETURN(err);
|
|
}
|
|
|
|
/*
|
|
Push the warning/error to error list if there is still room in the list
|
|
|
|
SYNOPSIS
|
|
push_warning_printf()
|
|
thd Thread handle
|
|
level Severity of warning (note, warning, error ...)
|
|
code Error number
|
|
msg Clear error message
|
|
*/
|
|
|
|
void push_warning_printf(THD *thd, MYSQL_ERROR::enum_warning_level level,
|
|
uint code, const char *format, ...)
|
|
{
|
|
va_list args;
|
|
char warning[MYSQL_ERRMSG_SIZE];
|
|
DBUG_ENTER("push_warning_printf");
|
|
DBUG_PRINT("enter",("warning: %u", code));
|
|
|
|
DBUG_ASSERT(code != 0);
|
|
DBUG_ASSERT(format != NULL);
|
|
|
|
va_start(args,format);
|
|
my_vsnprintf(warning, sizeof(warning), format, args);
|
|
va_end(args);
|
|
push_warning(thd, level, code, warning);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
Send all notes, errors or warnings to the client in a result set
|
|
|
|
SYNOPSIS
|
|
mysqld_show_warnings()
|
|
thd Thread handler
|
|
levels_to_show Bitmap for which levels to show
|
|
|
|
DESCRIPTION
|
|
Takes into account the current LIMIT
|
|
|
|
RETURN VALUES
|
|
FALSE ok
|
|
TRUE Error sending data to client
|
|
*/
|
|
|
|
const LEX_STRING warning_level_names[]=
|
|
{
|
|
{ C_STRING_WITH_LEN("Note") },
|
|
{ C_STRING_WITH_LEN("Warning") },
|
|
{ C_STRING_WITH_LEN("Error") },
|
|
{ C_STRING_WITH_LEN("?") }
|
|
};
|
|
|
|
bool mysqld_show_warnings(THD *thd, ulong levels_to_show)
|
|
{
|
|
List<Item> field_list;
|
|
DBUG_ENTER("mysqld_show_warnings");
|
|
|
|
field_list.push_back(new Item_empty_string("Level", 7));
|
|
field_list.push_back(new Item_return_int("Code",4, MYSQL_TYPE_LONG));
|
|
field_list.push_back(new Item_empty_string("Message",MYSQL_ERRMSG_SIZE));
|
|
|
|
if (thd->protocol->send_fields(&field_list,
|
|
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
|
|
DBUG_RETURN(TRUE);
|
|
|
|
MYSQL_ERROR *err;
|
|
SELECT_LEX *sel= &thd->lex->select_lex;
|
|
SELECT_LEX_UNIT *unit= &thd->lex->unit;
|
|
ha_rows idx= 0;
|
|
Protocol *protocol=thd->protocol;
|
|
|
|
unit->set_limit(sel);
|
|
|
|
List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
|
|
while ((err= it++))
|
|
{
|
|
/* Skip levels that the user is not interested in */
|
|
if (!(levels_to_show & ((ulong) 1 << err->level)))
|
|
continue;
|
|
if (++idx <= unit->offset_limit_cnt)
|
|
continue;
|
|
if (idx > unit->select_limit_cnt)
|
|
break;
|
|
protocol->prepare_for_resend();
|
|
protocol->store(warning_level_names[err->level].str,
|
|
warning_level_names[err->level].length, system_charset_info);
|
|
protocol->store((uint32) err->code);
|
|
protocol->store(err->msg, (uint) strlen(err->msg), system_charset_info);
|
|
if (protocol->write())
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
my_eof(thd);
|
|
DBUG_RETURN(FALSE);
|
|
}
|