mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
4462578a1c
Bug#25422 (Hang with log tables) Bug 17876 (Truncating mysql.slow_log in a SP after using cursor locks the thread) Bug 23044 (Warnings on flush of a log table) Bug 29129 (Resetting general_log while the GLOBAL READ LOCK is set causes a deadlock) Prior to this fix, the server would hang when performing concurrent ALTER TABLE or TRUNCATE TABLE statements against the LOG TABLES, which are mysql.general_log and mysql.slow_log. The root cause traces to the following code: in sql_base.cc, open_table() if (table->in_use != thd) { /* wait_for_condition will unlock LOCK_open for us */ wait_for_condition(thd, &LOCK_open, &COND_refresh); } The problem with this code is that the current implementation of the LOGGER creates 'fake' THD objects, like - Log_to_csv_event_handler::general_log_thd - Log_to_csv_event_handler::slow_log_thd which are not associated to a real thread running in the server, so that waiting for these non-existing threads to release table locks cause the dead lock. In general, the design of Log_to_csv_event_handler does not fit into the general architecture of the server, so that the concept of general_log_thd and slow_log_thd has to be abandoned: - this implementation does not work with table locking - it will not work with commands like SHOW PROCESSLIST - having the log tables always opened does not integrate well with DDL operations / FLUSH TABLES / SET GLOBAL READ_ONLY With this patch, the fundamental design of the LOGGER has been changed to: - always open and close a log table when writing a log - remove totally the usage of fake THD objects - clarify how locking of log tables is implemented in general. See WL#3984 for details related to the new locking design. Additional changes (misc bugs exposed and fixed): 1) mysqldump which would ignore some tables in dump_all_tables_in_db(), but forget to ignore the same in dump_all_views_in_db(). 2) mysqldump would also issue an empty "LOCK TABLE" command when all the tables to lock are to be ignored (numrows == 0), instead of not issuing the query. 3) Internal errors handlers could intercept errors but not warnings (see sql_error.cc). 4) Implementing a nested call to open tables, for the performance schema tables, exposed an existing bug in remove_table_from_cache(), which would perform: in_use->some_tables_deleted=1; against another thread, without any consideration about thread locking. This call inside remove_table_from_cache() was not required anyway, since calling mysql_lock_abort() takes care of aborting -- cleanly -- threads that might hold a lock on a table. This line (in_use->some_tables_deleted=1) has been removed. sql/handler.cc: Moved logic for system / log tables in the SQL layer. sql/handler.h: Moved logic for system / log tables in the SQL layer. sql/lock.cc: Revised locking of log tables sql/log.cc: Major cleanup: changed how log tables are locked / written to. sql/log.h: Major cleanup: changed how log tables are locked / written to. sql/mysql_priv.h: performance schema helpers sql/slave.cc: open_ltable() lock flags sql/sp.cc: open_ltable() lock flags sql/sql_acl.cc: open_ltable() lock flags sql/sql_class.h: performance schema helpers sql/sql_delete.cc: log tables cleanup in TRUNCATE sql/sql_error.cc: Internal handlers can also intercept warnings sql/sql_insert.cc: open_ltable() lock flags sql/sql_parse.cc: performance schema helpers sql/sql_plugin.cc: open_ltable() lock flags sql/sql_rename.cc: log tables cleanup in RENAME sql/sql_servers.cc: open_ltable() lock flags sql/sql_show.cc: Move INFORMATION_SCHEMA_NAME to table.cc sql/sql_table.cc: log tables cleanup (admin operations, ALTER TABLE) sql/sql_udf.cc: open_ltable() lock flags sql/table.cc: Implemented TABLE_CATEGORY. sql/share/errmsg.txt: Changed the wording and name of ER_CANT_READ_LOCK_LOG_TABLE sql/table.h: Implemented TABLE_CATEGORY. storage/csv/ha_tina.cc: Moved logic for system / log tables in the SQL layer. storage/csv/ha_tina.h: Moved logic for system / log tables in the SQL layer. storage/myisam/ha_myisam.cc: Moved logic for system / log tables in the SQL layer. storage/myisam/ha_myisam.h: Moved logic for system / log tables in the SQL layer. client/mysqldump.c: Don't lock tables in the ignore list. Don't issue empty LOCK TABLES queries. sql/sql_base.cc: log tables cleanup performance schema helpers mysql-test/r/ps.result: Adjust test results mysql-test/r/show_check.result: Adjust test results mysql-test/r/status.result: Adjust test results mysql-test/t/log_state.test: Added tests for Bug#29129 mysql-test/t/ps.test: Make the test output deterministic mysql-test/t/show_check.test: Make the test output deterministic mysql-test/r/log_state.result: Changed the default location of the log output to LOG_FILE, for backward compatibility with MySQL 5.0 --- Adjust test results mysql-test/r/log_tables.result: cleanup for -ps-protocol mysql-test/t/log_tables.test: cleanup for -ps-protocol sql/set_var.cc: Changed the default location of the log output to LOG_FILE, for backward compatibility with MySQL 5.0 --- log tables cleanup
254 lines
7.2 KiB
C++
254 lines
7.2 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));
|
|
|
|
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, 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++;
|
|
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[ERRMSGSIZE+20];
|
|
DBUG_ENTER("push_warning_printf");
|
|
DBUG_PRINT("enter",("warning: %u", code));
|
|
|
|
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, strlen(err->msg), system_charset_info);
|
|
if (protocol->write())
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
send_eof(thd);
|
|
DBUG_RETURN(FALSE);
|
|
}
|