2008-11-10 21:21:49 +01:00
|
|
|
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
|
2004-08-26 18:22:22 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
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
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2004-08-26 18:22:22 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
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.
|
2004-08-26 18:22:22 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
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 */
|
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
@file
|
|
|
|
|
|
|
|
@brief
|
|
|
|
logging of commands
|
|
|
|
|
|
|
|
@todo
|
|
|
|
Abort logging when we get an error in reading or writing log files
|
|
|
|
*/
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
#include "mysql_priv.h"
|
2000-10-27 06:11:55 +02:00
|
|
|
#include "sql_repl.h"
|
2005-03-21 22:09:42 +01:00
|
|
|
#include "rpl_filter.h"
|
2007-04-12 08:58:04 +02:00
|
|
|
#include "rpl_rli.h"
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
#include <my_dir.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <m_ctype.h> // For test_if_number
|
|
|
|
|
2009-09-30 22:10:22 +02:00
|
|
|
#ifdef _WIN32
|
2004-08-14 03:38:37 +02:00
|
|
|
#include "message.h"
|
|
|
|
#endif
|
|
|
|
|
2006-04-13 22:49:29 +02:00
|
|
|
#include <mysql/plugin.h>
|
2009-09-26 06:49:49 +02:00
|
|
|
#include "rpl_handler.h"
|
2006-04-13 22:49:29 +02:00
|
|
|
|
2006-01-19 03:56:06 +01:00
|
|
|
/* max size of the log message */
|
|
|
|
#define MAX_LOG_BUFFER_SIZE 1024
|
|
|
|
#define MAX_USER_HOST_SIZE 512
|
|
|
|
#define MAX_TIME_SIZE 32
|
2006-10-06 08:41:34 +02:00
|
|
|
#define MY_OFF_T_UNDEF (~(my_off_t)0UL)
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
#define FLAGSTR(V,F) ((V)&(F)?#F" ":"")
|
2006-01-19 03:56:06 +01:00
|
|
|
|
|
|
|
LOGGER logger;
|
|
|
|
|
2009-09-29 16:27:12 +02:00
|
|
|
MYSQL_BIN_LOG mysql_bin_log(&sync_binlog_period);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
static bool test_if_number(const char *str,
|
2009-11-22 04:59:48 +01:00
|
|
|
ulong *res, bool allow_wildcards);
|
2006-09-30 21:49:46 +02:00
|
|
|
static int binlog_init(void *p);
|
|
|
|
static int binlog_close_connection(handlerton *hton, THD *thd);
|
|
|
|
static int binlog_savepoint_set(handlerton *hton, THD *thd, void *sv);
|
|
|
|
static int binlog_savepoint_rollback(handlerton *hton, THD *thd, void *sv);
|
|
|
|
static int binlog_commit(handlerton *hton, THD *thd, bool all);
|
|
|
|
static int binlog_rollback(handlerton *hton, THD *thd, bool all);
|
|
|
|
static int binlog_prepare(handlerton *hton, THD *thd, bool all);
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2009-11-20 14:30:35 +01:00
|
|
|
/**
|
|
|
|
purge logs, master and slave sides both, related error code
|
|
|
|
convertor.
|
|
|
|
Called from @c purge_error_message(), @c MYSQL_BIN_LOG::reset_logs()
|
|
|
|
|
|
|
|
@param res an internal to purging routines error code
|
|
|
|
|
|
|
|
@return the user level error code ER_*
|
|
|
|
*/
|
|
|
|
uint purge_log_get_error_code(int res)
|
|
|
|
{
|
|
|
|
uint errcode= 0;
|
|
|
|
|
|
|
|
switch (res) {
|
|
|
|
case 0: break;
|
|
|
|
case LOG_INFO_EOF: errcode= ER_UNKNOWN_TARGET_BINLOG; break;
|
|
|
|
case LOG_INFO_IO: errcode= ER_IO_ERR_LOG_INDEX_READ; break;
|
|
|
|
case LOG_INFO_INVALID:errcode= ER_BINLOG_PURGE_PROHIBITED; break;
|
|
|
|
case LOG_INFO_SEEK: errcode= ER_FSEEK_FAIL; break;
|
|
|
|
case LOG_INFO_MEM: errcode= ER_OUT_OF_RESOURCES; break;
|
|
|
|
case LOG_INFO_FATAL: errcode= ER_BINLOG_PURGE_FATAL_ERR; break;
|
|
|
|
case LOG_INFO_IN_USE: errcode= ER_LOG_IN_USE; break;
|
|
|
|
case LOG_INFO_EMFILE: errcode= ER_BINLOG_PURGE_EMFILE; break;
|
|
|
|
default: errcode= ER_LOG_PURGE_UNKNOWN_ERR; break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return errcode;
|
|
|
|
}
|
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
/**
|
|
|
|
Silence all errors and warnings reported when performing a write
|
|
|
|
to a log table.
|
|
|
|
Errors and warnings are not reported to the client or SQL exception
|
|
|
|
handlers, so that the presence of logging does not interfere and affect
|
|
|
|
the logic of an application.
|
|
|
|
*/
|
|
|
|
class Silence_log_table_errors : public Internal_error_handler
|
|
|
|
{
|
2008-02-08 11:35:11 +01:00
|
|
|
char m_message[MYSQL_ERRMSG_SIZE];
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
public:
|
|
|
|
Silence_log_table_errors()
|
2008-02-08 11:35:11 +01:00
|
|
|
{
|
|
|
|
m_message[0]= '\0';
|
|
|
|
}
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
|
|
|
|
virtual ~Silence_log_table_errors() {}
|
|
|
|
|
2009-09-10 11:18:29 +02:00
|
|
|
virtual bool handle_condition(THD *thd,
|
|
|
|
uint sql_errno,
|
|
|
|
const char* sql_state,
|
|
|
|
MYSQL_ERROR::enum_warning_level level,
|
|
|
|
const char* msg,
|
|
|
|
MYSQL_ERROR ** cond_hdl);
|
2008-02-08 11:35:11 +01:00
|
|
|
const char *message() const { return m_message; }
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
bool
|
2009-09-10 11:18:29 +02:00
|
|
|
Silence_log_table_errors::handle_condition(THD *,
|
|
|
|
uint,
|
|
|
|
const char*,
|
|
|
|
MYSQL_ERROR::enum_warning_level,
|
|
|
|
const char* msg,
|
|
|
|
MYSQL_ERROR ** cond_hdl)
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
{
|
2009-09-10 11:18:29 +02:00
|
|
|
*cond_hdl= NULL;
|
|
|
|
strmake(m_message, msg, sizeof(m_message)-1);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2006-05-22 20:46:13 +02:00
|
|
|
sql_print_message_func sql_print_message_handlers[3] =
|
|
|
|
{
|
|
|
|
sql_print_information,
|
|
|
|
sql_print_warning,
|
|
|
|
sql_print_error
|
|
|
|
};
|
|
|
|
|
|
|
|
|
Bug #33693 general log name and location depend on PID file,
not on predefined values
The default name of the PID file was constructed, as documented,
based on the hostname. This name was subsequently used as the
base for the general log file name. If the name of the PID
file was overridden in the configuration, and no explicit name
was set for the general log file, the path location for the
PID file was used also for the general log file.
A new variable, 'default_logfile_name', has been introduced. This name
is constructed based on the hostname, and is then used to
construct both the PID file and the general log file.
The general log file will now, unless explicitly set, be
located in the server data directory (as documentated in
the server docs)
2009-10-12 15:35:30 +02:00
|
|
|
/**
|
|
|
|
Create the name of the default general log file
|
|
|
|
|
|
|
|
@param[IN] buff Location for building new string.
|
|
|
|
@param[IN] log_ext The extension for the file (e.g .log)
|
|
|
|
@returns Pointer to a new string containing the name
|
|
|
|
*/
|
2006-06-19 15:30:55 +02:00
|
|
|
char *make_default_log_name(char *buff,const char* log_ext)
|
|
|
|
{
|
Bug #33693 general log name and location depend on PID file,
not on predefined values
The default name of the PID file was constructed, as documented,
based on the hostname. This name was subsequently used as the
base for the general log file name. If the name of the PID
file was overridden in the configuration, and no explicit name
was set for the general log file, the path location for the
PID file was used also for the general log file.
A new variable, 'default_logfile_name', has been introduced. This name
is constructed based on the hostname, and is then used to
construct both the PID file and the general log file.
The general log file will now, unless explicitly set, be
located in the server data directory (as documentated in
the server docs)
2009-10-12 15:35:30 +02:00
|
|
|
strmake(buff, default_logfile_name, FN_REFLEN-5);
|
2006-06-19 15:30:55 +02:00
|
|
|
return fn_format(buff, buff, mysql_data_home, log_ext,
|
2007-03-20 11:21:27 +01:00
|
|
|
MYF(MY_UNPACK_FILENAME|MY_REPLACE_EXT));
|
2006-06-19 15:30:55 +02:00
|
|
|
}
|
|
|
|
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
/*
|
|
|
|
Helper class to hold a mutex for the duration of the
|
|
|
|
block.
|
|
|
|
|
|
|
|
Eliminates the need for explicit unlocking of mutexes on, e.g.,
|
|
|
|
error returns. On passing a null pointer, the sentry will not do
|
|
|
|
anything.
|
|
|
|
*/
|
|
|
|
class Mutex_sentry
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Mutex_sentry(pthread_mutex_t *mutex)
|
|
|
|
: m_mutex(mutex)
|
|
|
|
{
|
|
|
|
if (m_mutex)
|
|
|
|
pthread_mutex_lock(mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
~Mutex_sentry()
|
|
|
|
{
|
|
|
|
if (m_mutex)
|
|
|
|
pthread_mutex_unlock(m_mutex);
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
m_mutex= 0;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
pthread_mutex_t *m_mutex;
|
|
|
|
|
|
|
|
// It's not allowed to copy this object in any way
|
|
|
|
Mutex_sentry(Mutex_sentry const&);
|
|
|
|
void operator=(Mutex_sentry const&);
|
|
|
|
};
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
2006-10-05 10:46:14 +02:00
|
|
|
Helper class to store binary log transaction data.
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
2006-10-05 10:46:14 +02:00
|
|
|
class binlog_trx_data {
|
|
|
|
public:
|
|
|
|
binlog_trx_data()
|
2009-10-06 02:38:58 +02:00
|
|
|
: at_least_one_stmt_committed(0), incident(FALSE), m_pending(0),
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
before_stmt_pos(MY_OFF_T_UNDEF)
|
2006-10-05 10:46:14 +02:00
|
|
|
{
|
|
|
|
trans_log.end_of_file= max_binlog_cache_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
~binlog_trx_data()
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(pending() == NULL);
|
|
|
|
close_cached_file(&trans_log);
|
|
|
|
}
|
|
|
|
|
|
|
|
my_off_t position() const {
|
|
|
|
return my_b_tell(&trans_log);
|
|
|
|
}
|
|
|
|
|
2006-03-29 13:27:36 +02:00
|
|
|
bool empty() const
|
|
|
|
{
|
2006-10-05 10:46:14 +02:00
|
|
|
return pending() == NULL && my_b_tell(&trans_log) == 0;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
2006-10-05 10:46:14 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Truncate the transaction cache to a certain position. This
|
|
|
|
includes deleting the pending event.
|
|
|
|
*/
|
|
|
|
void truncate(my_off_t pos)
|
|
|
|
{
|
2007-02-26 18:05:08 +01:00
|
|
|
DBUG_PRINT("info", ("truncating to position %lu", (ulong) pos));
|
|
|
|
DBUG_PRINT("info", ("before_stmt_pos=%lu", (ulong) pos));
|
2009-10-06 02:38:58 +02:00
|
|
|
if (pending())
|
|
|
|
{
|
|
|
|
delete pending();
|
|
|
|
}
|
2006-10-05 10:46:14 +02:00
|
|
|
set_pending(0);
|
|
|
|
reinit_io_cache(&trans_log, WRITE_CACHE, pos, 0, 0);
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
trans_log.end_of_file= max_binlog_cache_size;
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
if (pos < before_stmt_pos)
|
|
|
|
before_stmt_pos= MY_OFF_T_UNDEF;
|
2008-03-28 13:16:41 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
The only valid positions that can be truncated to are at the
|
|
|
|
beginning of a statement. We are relying on this fact to be able
|
2009-10-06 02:38:58 +02:00
|
|
|
to set the at_least_one_stmt_committed flag correctly. In other word, if
|
2008-03-28 13:16:41 +01:00
|
|
|
we are truncating to the beginning of the transaction cache,
|
|
|
|
there will be no statements in the cache, otherwhise, we will
|
|
|
|
have at least one statement in the transaction cache.
|
|
|
|
*/
|
2009-10-06 02:38:58 +02:00
|
|
|
at_least_one_stmt_committed= (pos > 0);
|
2006-10-05 10:46:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Reset the entire contents of the transaction cache, emptying it
|
|
|
|
completely.
|
|
|
|
*/
|
|
|
|
void reset() {
|
|
|
|
if (!empty())
|
|
|
|
truncate(0);
|
2006-10-06 08:41:34 +02:00
|
|
|
before_stmt_pos= MY_OFF_T_UNDEF;
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
incident= FALSE;
|
2006-10-05 10:46:14 +02:00
|
|
|
trans_log.end_of_file= max_binlog_cache_size;
|
2008-12-02 18:32:07 +01:00
|
|
|
DBUG_ASSERT(empty());
|
2006-10-05 10:46:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
Rows_log_event *pending() const
|
|
|
|
{
|
|
|
|
return m_pending;
|
|
|
|
}
|
|
|
|
|
|
|
|
void set_pending(Rows_log_event *const pending)
|
|
|
|
{
|
|
|
|
m_pending= pending;
|
|
|
|
}
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
IO_CACHE trans_log; // The transaction cache
|
2006-10-05 10:46:14 +02:00
|
|
|
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
void set_incident(void)
|
|
|
|
{
|
|
|
|
incident= TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool has_incident(void)
|
|
|
|
{
|
|
|
|
return(incident);
|
|
|
|
}
|
|
|
|
|
2008-03-28 13:16:41 +01:00
|
|
|
/**
|
|
|
|
Boolean that is true if there is at least one statement in the
|
|
|
|
transaction cache.
|
|
|
|
*/
|
2009-10-06 02:38:58 +02:00
|
|
|
bool at_least_one_stmt_committed;
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
bool incident;
|
2008-03-28 13:16:41 +01:00
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
private:
|
|
|
|
/*
|
|
|
|
Pending binrows event. This event is the event where the rows are
|
|
|
|
currently written.
|
|
|
|
*/
|
|
|
|
Rows_log_event *m_pending;
|
|
|
|
|
|
|
|
public:
|
|
|
|
/*
|
|
|
|
Binlog position before the start of the current statement.
|
|
|
|
*/
|
|
|
|
my_off_t before_stmt_pos;
|
2005-12-22 06:39:02 +01:00
|
|
|
};
|
|
|
|
|
2006-09-15 19:28:00 +02:00
|
|
|
handlerton *binlog_hton;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
bool LOGGER::is_log_table_enabled(uint log_table_type)
|
|
|
|
{
|
|
|
|
switch (log_table_type) {
|
|
|
|
case QUERY_LOG_SLOW:
|
|
|
|
return (table_log_handler != NULL) && opt_slow_log;
|
|
|
|
case QUERY_LOG_GENERAL:
|
|
|
|
return (table_log_handler != NULL) && opt_log ;
|
|
|
|
default:
|
|
|
|
DBUG_ASSERT(0);
|
|
|
|
return FALSE; /* make compiler happy */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2006-10-13 15:26:46 +02:00
|
|
|
/* Check if a given table is opened log table */
|
|
|
|
int check_if_log_table(uint db_len, const char *db, uint table_name_len,
|
|
|
|
const char *table_name, uint check_if_opened)
|
|
|
|
{
|
|
|
|
if (db_len == 5 &&
|
|
|
|
!(lower_case_table_names ?
|
|
|
|
my_strcasecmp(system_charset_info, db, "mysql") :
|
|
|
|
strcmp(db, "mysql")))
|
|
|
|
{
|
|
|
|
if (table_name_len == 11 && !(lower_case_table_names ?
|
|
|
|
my_strcasecmp(system_charset_info,
|
|
|
|
table_name, "general_log") :
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
strcmp(table_name, "general_log")))
|
|
|
|
{
|
|
|
|
if (!check_if_opened || logger.is_log_table_enabled(QUERY_LOG_GENERAL))
|
|
|
|
return QUERY_LOG_GENERAL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (table_name_len == 8 && !(lower_case_table_names ?
|
|
|
|
my_strcasecmp(system_charset_info, table_name, "slow_log") :
|
|
|
|
strcmp(table_name, "slow_log")))
|
|
|
|
{
|
|
|
|
if (!check_if_opened || logger.is_log_table_enabled(QUERY_LOG_SLOW))
|
2006-10-13 15:26:46 +02:00
|
|
|
return QUERY_LOG_SLOW;
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2006-10-13 15:26:46 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-24 15:00:23 +02:00
|
|
|
|
2006-01-19 03:56:06 +01:00
|
|
|
Log_to_csv_event_handler::Log_to_csv_event_handler()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Log_to_csv_event_handler::~Log_to_csv_event_handler()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2006-10-13 15:26:46 +02:00
|
|
|
|
2006-01-19 03:56:06 +01:00
|
|
|
void Log_to_csv_event_handler::cleanup()
|
|
|
|
{
|
|
|
|
logger.is_log_tables_initialized= FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* log event handlers */
|
|
|
|
|
2007-12-13 21:58:55 +01:00
|
|
|
/**
|
2006-01-19 03:56:06 +01:00
|
|
|
Log command to the general log table
|
|
|
|
|
2007-12-13 21:58:55 +01:00
|
|
|
Log given command to the general log table.
|
|
|
|
|
|
|
|
@param event_time command start timestamp
|
|
|
|
@param user_host the pointer to the string with user@host info
|
|
|
|
@param user_host_len length of the user_host string. this is computed
|
|
|
|
once and passed to all general log event handlers
|
|
|
|
@param thread_id Id of the thread, issued a query
|
|
|
|
@param command_type the type of the command being logged
|
|
|
|
@param command_type_len the length of the string above
|
|
|
|
@param sql_text the very text of the query being executed
|
|
|
|
@param sql_text_len the length of sql_text string
|
|
|
|
|
|
|
|
|
|
|
|
@return This function attempts to never call my_error(). This is
|
|
|
|
necessary, because general logging happens already after a statement
|
|
|
|
status has been sent to the client, so the client can not see the
|
|
|
|
error anyway. Besides, the error is not related to the statement
|
|
|
|
being executed and is internal, and thus should be handled
|
|
|
|
internally (@todo: how?).
|
|
|
|
If a write to the table has failed, the function attempts to
|
|
|
|
write to a short error message to the file. The failure is also
|
|
|
|
indicated in the return value.
|
|
|
|
|
|
|
|
@retval FALSE OK
|
|
|
|
@retval TRUE error occured
|
2006-01-19 03:56:06 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
bool Log_to_csv_event_handler::
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
log_general(THD *thd, time_t event_time, const char *user_host,
|
2006-01-19 03:56:06 +01:00
|
|
|
uint user_host_len, int thread_id,
|
|
|
|
const char *command_type, uint command_type_len,
|
2006-02-03 11:05:14 +01:00
|
|
|
const char *sql_text, uint sql_text_len,
|
|
|
|
CHARSET_INFO *client_cs)
|
2006-01-19 03:56:06 +01:00
|
|
|
{
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
TABLE_LIST table_list;
|
|
|
|
TABLE *table;
|
|
|
|
bool result= TRUE;
|
|
|
|
bool need_close= FALSE;
|
|
|
|
bool need_pop= FALSE;
|
|
|
|
bool need_rnd_end= FALSE;
|
2007-06-15 01:43:19 +02:00
|
|
|
uint field_index;
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
Silence_log_table_errors error_handler;
|
2010-01-21 21:43:03 +01:00
|
|
|
Open_tables_backup open_tables_backup;
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
ulonglong save_thd_options;
|
|
|
|
bool save_time_zone_used;
|
|
|
|
|
2007-08-03 00:14:27 +02:00
|
|
|
/*
|
|
|
|
CSV uses TIME_to_timestamp() internally if table needs to be repaired
|
|
|
|
which will set thd->time_zone_used
|
|
|
|
*/
|
|
|
|
save_time_zone_used= thd->time_zone_used;
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
|
|
|
|
save_thd_options= thd->options;
|
|
|
|
thd->options&= ~OPTION_BIN_LOG;
|
|
|
|
|
2009-12-08 10:57:07 +01:00
|
|
|
table_list.init_one_table(MYSQL_SCHEMA_NAME.str, MYSQL_SCHEMA_NAME.length,
|
|
|
|
GENERAL_LOG_NAME.str, GENERAL_LOG_NAME.length,
|
|
|
|
GENERAL_LOG_NAME.str,
|
|
|
|
TL_WRITE_CONCURRENT_INSERT);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
|
2007-12-13 21:58:55 +01:00
|
|
|
/*
|
|
|
|
1) open_performance_schema_table generates an error of the
|
|
|
|
table can not be opened or is corrupted.
|
|
|
|
2) "INSERT INTO general_log" can generate warning sometimes.
|
|
|
|
|
|
|
|
Suppress these warnings and errors, they can't be dealt with
|
|
|
|
properly anyway.
|
|
|
|
|
|
|
|
QQ: this problem needs to be studied in more detail.
|
|
|
|
Comment this 2 lines and run "cast.test" to see what's happening.
|
|
|
|
*/
|
|
|
|
thd->push_internal_handler(& error_handler);
|
|
|
|
need_pop= TRUE;
|
|
|
|
|
2007-08-02 09:50:00 +02:00
|
|
|
if (!(table= open_performance_schema_table(thd, & table_list,
|
|
|
|
& open_tables_backup)))
|
|
|
|
goto err;
|
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
need_close= TRUE;
|
|
|
|
|
2007-08-02 09:50:00 +02:00
|
|
|
if (table->file->extra(HA_EXTRA_MARK_AS_LOG_TABLE) ||
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
table->file->ha_rnd_init(0))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
need_rnd_end= TRUE;
|
|
|
|
|
|
|
|
/* Honor next number columns if present */
|
|
|
|
table->next_number_field= table->found_next_number_field;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2006-03-06 19:03:17 +01:00
|
|
|
/*
|
|
|
|
NOTE: we do not call restore_record() here, as all fields are
|
|
|
|
filled by the Logger (=> no need to load default ones).
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
We do not set a value for table->field[0], as it will use
|
|
|
|
default value (which is CURRENT_TIMESTAMP).
|
|
|
|
*/
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2006-10-13 15:26:46 +02:00
|
|
|
/* check that all columns exist */
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
if (table->s->fields < 6)
|
2006-10-13 15:26:46 +02:00
|
|
|
goto err;
|
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
DBUG_ASSERT(table->field[0]->type() == MYSQL_TYPE_TIMESTAMP);
|
|
|
|
|
2007-08-03 07:08:33 +02:00
|
|
|
((Field_timestamp*) table->field[0])->store_timestamp((my_time_t)
|
|
|
|
event_time);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
|
2006-10-13 15:26:46 +02:00
|
|
|
/* do a write */
|
|
|
|
if (table->field[1]->store(user_host, user_host_len, client_cs) ||
|
|
|
|
table->field[2]->store((longlong) thread_id, TRUE) ||
|
|
|
|
table->field[3]->store((longlong) server_id, TRUE) ||
|
2007-10-12 01:55:18 +02:00
|
|
|
table->field[4]->store(command_type, command_type_len, client_cs))
|
2006-10-13 15:26:46 +02:00
|
|
|
goto err;
|
|
|
|
|
2007-10-12 01:55:18 +02:00
|
|
|
/*
|
|
|
|
A positive return value in store() means truncation.
|
|
|
|
Still logging a message in the log in this case.
|
|
|
|
*/
|
2008-02-29 14:56:50 +01:00
|
|
|
table->field[5]->flags|= FIELDFLAG_HEX_ESCAPE;
|
2007-10-12 01:55:18 +02:00
|
|
|
if (table->field[5]->store(sql_text, sql_text_len, client_cs) < 0)
|
|
|
|
goto err;
|
2007-08-03 00:14:27 +02:00
|
|
|
|
|
|
|
/* mark all fields as not null */
|
2006-03-06 19:03:17 +01:00
|
|
|
table->field[1]->set_notnull();
|
|
|
|
table->field[2]->set_notnull();
|
|
|
|
table->field[3]->set_notnull();
|
|
|
|
table->field[4]->set_notnull();
|
|
|
|
table->field[5]->set_notnull();
|
2006-10-13 15:26:46 +02:00
|
|
|
|
Bug#27857 (Log tables supplies the wrong value for generating AUTO_INCREMENT
numbers)
Before this patch, the code in the class Log_to_csv_event_handler, which is
used by the global LOGGER object to write to the tables mysql.slow_log and
mysql_general_log, was supporting only records of the format defined for
these tables in the database creation scripts.
Also before this patch, the server would allow, with certain limitations,
to perform ALTER TABLE on the LOG TABLES.
As implemented, the behavior of the server, with regards to LOG TABLES,
is inconsistent:
- either ALTER TABLES on LOG TABLES should be prohibited,
and the code writing to these tables can make assumptions on the record
format,
- or ALTER TABLE on LOG TABLES is permitted, in which case the code
writing a record to these tables should be more flexible and honor
new fields.
In particular, adding an AUTO_INCREMENT column to the logs,
does not work as expected (per the bug report).
Given that the ALTER TABLE on log tables statement has been explicitly
implemented to check that the log should be off to perform the operation,
and that current test cases already cover this, the user expectation is
already set that this is a "feature" and should be supported.
With this patch, the server will:
- populate AUTO INCREMENT columns if present,
- populate any additional column with it's default value
when writing a record to the LOG TABLES.
Tests are provided, that detail the precise sequence of statements
a SUPER user might want to perform to add more columns to the log tables.
2007-06-14 06:05:22 +02:00
|
|
|
/* Set any extra columns to their default values */
|
|
|
|
for (field_index= 6 ; field_index < table->s->fields ; field_index++)
|
|
|
|
{
|
|
|
|
table->field[field_index]->set_default();
|
|
|
|
}
|
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
/* log table entries are not replicated */
|
2007-07-30 19:56:02 +02:00
|
|
|
if (table->file->ha_write_row(table->record[0]))
|
2007-10-12 01:55:18 +02:00
|
|
|
goto err;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
result= FALSE;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2006-10-13 15:26:46 +02:00
|
|
|
err:
|
2008-02-08 15:25:20 +01:00
|
|
|
if (result && !thd->killed)
|
2008-02-08 11:35:11 +01:00
|
|
|
sql_print_error("Failed to write to mysql.general_log: %s",
|
|
|
|
error_handler.message());
|
2007-10-12 01:55:18 +02:00
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
if (need_rnd_end)
|
|
|
|
{
|
|
|
|
table->file->ha_rnd_end();
|
|
|
|
table->file->ha_release_auto_increment();
|
|
|
|
}
|
|
|
|
if (need_pop)
|
|
|
|
thd->pop_internal_handler();
|
|
|
|
if (need_close)
|
|
|
|
close_performance_schema_table(thd, & open_tables_backup);
|
|
|
|
|
|
|
|
thd->options= save_thd_options;
|
|
|
|
thd->time_zone_used= save_time_zone_used;
|
|
|
|
return result;
|
2006-01-19 03:56:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Log a query to the slow log table
|
|
|
|
|
|
|
|
SYNOPSIS
|
2006-03-06 19:03:17 +01:00
|
|
|
log_slow()
|
2006-01-19 03:56:06 +01:00
|
|
|
thd THD of the query
|
|
|
|
current_time current timestamp
|
|
|
|
query_start_arg command start timestamp
|
|
|
|
user_host the pointer to the string with user@host info
|
|
|
|
user_host_len length of the user_host string. this is computed once
|
|
|
|
and passed to all general log event handlers
|
2007-07-30 10:33:50 +02:00
|
|
|
query_time Amount of time the query took to execute (in microseconds)
|
|
|
|
lock_time Amount of time the query was locked (in microseconds)
|
2006-01-19 03:56:06 +01:00
|
|
|
is_command The flag, which determines, whether the sql_text is a
|
|
|
|
query or an administrator command (these are treated
|
|
|
|
differently by the old logging routines)
|
|
|
|
sql_text the very text of the query or administrator command
|
|
|
|
processed
|
|
|
|
sql_text_len the length of sql_text string
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
Log a query to the slow log table
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
FALSE - OK
|
|
|
|
TRUE - error occured
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool Log_to_csv_event_handler::
|
|
|
|
log_slow(THD *thd, time_t current_time, time_t query_start_arg,
|
|
|
|
const char *user_host, uint user_host_len,
|
2007-07-30 10:33:50 +02:00
|
|
|
ulonglong query_utime, ulonglong lock_utime, bool is_command,
|
2006-01-19 03:56:06 +01:00
|
|
|
const char *sql_text, uint sql_text_len)
|
|
|
|
{
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
TABLE_LIST table_list;
|
|
|
|
TABLE *table;
|
|
|
|
bool result= TRUE;
|
|
|
|
bool need_close= FALSE;
|
|
|
|
bool need_rnd_end= FALSE;
|
2008-02-08 13:53:57 +01:00
|
|
|
Silence_log_table_errors error_handler;
|
2010-01-21 21:43:03 +01:00
|
|
|
Open_tables_backup open_tables_backup;
|
2006-02-03 11:05:14 +01:00
|
|
|
CHARSET_INFO *client_cs= thd->variables.character_set_client;
|
2007-08-03 00:14:27 +02:00
|
|
|
bool save_time_zone_used;
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
DBUG_ENTER("Log_to_csv_event_handler::log_slow");
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2008-02-08 13:53:57 +01:00
|
|
|
thd->push_internal_handler(& error_handler);
|
2007-08-03 00:14:27 +02:00
|
|
|
/*
|
|
|
|
CSV uses TIME_to_timestamp() internally if table needs to be repaired
|
|
|
|
which will set thd->time_zone_used
|
|
|
|
*/
|
|
|
|
save_time_zone_used= thd->time_zone_used;
|
|
|
|
|
2009-12-08 10:57:07 +01:00
|
|
|
table_list.init_one_table(MYSQL_SCHEMA_NAME.str, MYSQL_SCHEMA_NAME.length,
|
|
|
|
SLOW_LOG_NAME.str, SLOW_LOG_NAME.length,
|
|
|
|
SLOW_LOG_NAME.str,
|
|
|
|
TL_WRITE_CONCURRENT_INSERT);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
|
2007-08-02 09:50:00 +02:00
|
|
|
if (!(table= open_performance_schema_table(thd, & table_list,
|
|
|
|
& open_tables_backup)))
|
|
|
|
goto err;
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
|
|
|
|
need_close= TRUE;
|
|
|
|
|
2007-08-02 09:50:00 +02:00
|
|
|
if (table->file->extra(HA_EXTRA_MARK_AS_LOG_TABLE) ||
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
table->file->ha_rnd_init(0))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
need_rnd_end= TRUE;
|
|
|
|
|
|
|
|
/* Honor next number columns if present */
|
|
|
|
table->next_number_field= table->found_next_number_field;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2006-03-06 19:03:17 +01:00
|
|
|
restore_record(table, s->default_values); // Get empty record
|
2006-01-19 03:56:06 +01:00
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
/* check that all columns exist */
|
|
|
|
if (table->s->fields < 11)
|
|
|
|
goto err;
|
|
|
|
|
2007-08-03 00:14:27 +02:00
|
|
|
/* store the time and user values */
|
|
|
|
DBUG_ASSERT(table->field[0]->type() == MYSQL_TYPE_TIMESTAMP);
|
2007-08-03 07:08:33 +02:00
|
|
|
((Field_timestamp*) table->field[0])->store_timestamp((my_time_t)
|
|
|
|
current_time);
|
2006-10-13 15:26:46 +02:00
|
|
|
if (table->field[1]->store(user_host, user_host_len, client_cs))
|
|
|
|
goto err;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
|
|
|
if (query_start_arg)
|
|
|
|
{
|
2007-07-30 10:33:50 +02:00
|
|
|
longlong query_time= (longlong) (query_utime/1000000);
|
|
|
|
longlong lock_time= (longlong) (lock_utime/1000000);
|
2007-04-04 21:40:47 +02:00
|
|
|
/*
|
|
|
|
A TIME field can not hold the full longlong range; query_time or
|
|
|
|
lock_time may be truncated without warning here, if greater than
|
|
|
|
839 hours (~35 days)
|
|
|
|
*/
|
2007-04-10 17:01:29 +02:00
|
|
|
MYSQL_TIME t;
|
2007-04-04 21:40:47 +02:00
|
|
|
t.neg= 0;
|
|
|
|
|
2006-01-19 03:56:06 +01:00
|
|
|
/* fill in query_time field */
|
2007-04-04 21:40:47 +02:00
|
|
|
calc_time_from_sec(&t, (long) min(query_time, (longlong) TIME_MAX_VALUE_SECONDS), 0);
|
|
|
|
if (table->field[2]->store_time(&t, MYSQL_TIMESTAMP_TIME))
|
2006-10-13 15:26:46 +02:00
|
|
|
goto err;
|
2006-01-19 03:56:06 +01:00
|
|
|
/* lock_time */
|
2007-04-04 21:40:47 +02:00
|
|
|
calc_time_from_sec(&t, (long) min(lock_time, (longlong) TIME_MAX_VALUE_SECONDS), 0);
|
|
|
|
if (table->field[3]->store_time(&t, MYSQL_TIMESTAMP_TIME))
|
2006-10-13 15:26:46 +02:00
|
|
|
goto err;
|
2006-01-19 03:56:06 +01:00
|
|
|
/* rows_sent */
|
2006-10-13 15:26:46 +02:00
|
|
|
if (table->field[4]->store((longlong) thd->sent_row_count, TRUE))
|
|
|
|
goto err;
|
2006-01-19 03:56:06 +01:00
|
|
|
/* rows_examined */
|
2006-10-13 15:26:46 +02:00
|
|
|
if (table->field[5]->store((longlong) thd->examined_row_count, TRUE))
|
|
|
|
goto err;
|
2006-01-19 03:56:06 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
table->field[2]->set_null();
|
|
|
|
table->field[3]->set_null();
|
|
|
|
table->field[4]->set_null();
|
|
|
|
table->field[5]->set_null();
|
|
|
|
}
|
2006-03-06 19:03:17 +01:00
|
|
|
/* fill database field */
|
2006-01-19 03:56:06 +01:00
|
|
|
if (thd->db)
|
2006-03-06 19:03:17 +01:00
|
|
|
{
|
2006-10-13 15:26:46 +02:00
|
|
|
if (table->field[6]->store(thd->db, thd->db_length, client_cs))
|
|
|
|
goto err;
|
2006-03-06 19:03:17 +01:00
|
|
|
table->field[6]->set_notnull();
|
|
|
|
}
|
2006-01-19 03:56:06 +01:00
|
|
|
|
WL#3146 "less locking in auto_increment":
this is a cleanup patch for our current auto_increment handling:
new names for auto_increment variables in THD, new methods to manipulate them
(see sql_class.h), some move into handler::, causing less backup/restore
work when executing substatements.
This makes the logic hopefully clearer, less work is is needed in
mysql_insert().
By cleaning up, using different variables for different purposes (instead
of one for 3 things...), we fix those bugs, which someone may want to fix
in 5.0 too:
BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
statement-based"
BUG#20341 "stored function inserting into one auto_increment puts bad
data in slave"
BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
(now if a row is updated, LAST_INSERT_ID() will return its id)
and re-fixes:
BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
(already fixed differently by Ramil in 4.1)
Test of documented behaviour of mysql_insert_id() (there was no test).
The behaviour changes introduced are:
- LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
successfully inserted", instead of "the first autogenerated auto_increment
value if any row was successfully inserted", see auto_increment.test.
Same for mysql_insert_id(), see mysql_client_test.c.
- LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
mysql_client_test.c.
- LAST_INSERT_ID() does not change if no autogenerated value was successfully
inserted (it used to then be 0), see auto_increment.test.
- if in INSERT SELECT no autogenerated value was successfully inserted,
mysql_insert_id() now returns the id of the last inserted row (it already
did this for INSERT VALUES), see mysql_client_test.c.
- if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
(it already did this for INSERT VALUES), see mysql_client_test.c.
- NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
influences not only the first row now.
Additionally, when unlocking a table we check that the thread is not keeping
a next_insert_id (as the table is unlocked that id is potentially out-of-date);
forgetting about this next_insert_id is done in a new
handler::ha_release_auto_increment().
Finally we prepare for engines capable of reserving finite-length intervals
of auto_increment values: we store such intervals in THD. The next step
(to be done by the replication team in 5.1) is to read those intervals from
THD and actually store them in the statement-based binary log. NDB
will be a good engine to test that.
2006-07-09 17:52:19 +02:00
|
|
|
if (thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt)
|
2006-03-06 19:03:17 +01:00
|
|
|
{
|
2006-10-13 15:26:46 +02:00
|
|
|
if (table->
|
|
|
|
field[7]->store((longlong)
|
|
|
|
thd->first_successful_insert_id_in_prev_stmt_for_binlog,
|
|
|
|
TRUE))
|
|
|
|
goto err;
|
2006-03-06 19:03:17 +01:00
|
|
|
table->field[7]->set_notnull();
|
|
|
|
}
|
2006-01-19 03:56:06 +01:00
|
|
|
|
WL#3146 "less locking in auto_increment":
this is a cleanup patch for our current auto_increment handling:
new names for auto_increment variables in THD, new methods to manipulate them
(see sql_class.h), some move into handler::, causing less backup/restore
work when executing substatements.
This makes the logic hopefully clearer, less work is is needed in
mysql_insert().
By cleaning up, using different variables for different purposes (instead
of one for 3 things...), we fix those bugs, which someone may want to fix
in 5.0 too:
BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
statement-based"
BUG#20341 "stored function inserting into one auto_increment puts bad
data in slave"
BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
(now if a row is updated, LAST_INSERT_ID() will return its id)
and re-fixes:
BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
(already fixed differently by Ramil in 4.1)
Test of documented behaviour of mysql_insert_id() (there was no test).
The behaviour changes introduced are:
- LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
successfully inserted", instead of "the first autogenerated auto_increment
value if any row was successfully inserted", see auto_increment.test.
Same for mysql_insert_id(), see mysql_client_test.c.
- LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
mysql_client_test.c.
- LAST_INSERT_ID() does not change if no autogenerated value was successfully
inserted (it used to then be 0), see auto_increment.test.
- if in INSERT SELECT no autogenerated value was successfully inserted,
mysql_insert_id() now returns the id of the last inserted row (it already
did this for INSERT VALUES), see mysql_client_test.c.
- if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
(it already did this for INSERT VALUES), see mysql_client_test.c.
- NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
influences not only the first row now.
Additionally, when unlocking a table we check that the thread is not keeping
a next_insert_id (as the table is unlocked that id is potentially out-of-date);
forgetting about this next_insert_id is done in a new
handler::ha_release_auto_increment().
Finally we prepare for engines capable of reserving finite-length intervals
of auto_increment values: we store such intervals in THD. The next step
(to be done by the replication team in 5.1) is to read those intervals from
THD and actually store them in the statement-based binary log. NDB
will be a good engine to test that.
2006-07-09 17:52:19 +02:00
|
|
|
/*
|
|
|
|
Set value if we do an insert on autoincrement column. Note that for
|
|
|
|
some engines (those for which get_auto_increment() does not leave a
|
|
|
|
table lock until the statement ends), this is just the first value and
|
|
|
|
the next ones used may not be contiguous to it.
|
|
|
|
*/
|
|
|
|
if (thd->auto_inc_intervals_in_cur_stmt_for_binlog.nb_elements() > 0)
|
2006-03-06 19:03:17 +01:00
|
|
|
{
|
2006-10-13 15:26:46 +02:00
|
|
|
if (table->
|
|
|
|
field[8]->store((longlong)
|
|
|
|
thd->auto_inc_intervals_in_cur_stmt_for_binlog.minimum(), TRUE))
|
|
|
|
goto err;
|
2006-03-06 19:03:17 +01:00
|
|
|
table->field[8]->set_notnull();
|
|
|
|
}
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2006-10-13 15:26:46 +02:00
|
|
|
if (table->field[9]->store((longlong) server_id, TRUE))
|
|
|
|
goto err;
|
2006-03-06 19:03:17 +01:00
|
|
|
table->field[9]->set_notnull();
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2007-10-12 01:55:18 +02:00
|
|
|
/*
|
|
|
|
Column sql_text.
|
|
|
|
A positive return value in store() means truncation.
|
|
|
|
Still logging a message in the log in this case.
|
|
|
|
*/
|
|
|
|
if (table->field[10]->store(sql_text, sql_text_len, client_cs) < 0)
|
2006-10-13 15:26:46 +02:00
|
|
|
goto err;
|
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
/* log table entries are not replicated */
|
2007-07-30 19:56:02 +02:00
|
|
|
if (table->file->ha_write_row(table->record[0]))
|
2007-10-12 01:55:18 +02:00
|
|
|
goto err;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
result= FALSE;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2006-10-13 15:26:46 +02:00
|
|
|
err:
|
2008-02-08 13:53:57 +01:00
|
|
|
thd->pop_internal_handler();
|
|
|
|
|
2008-02-08 15:25:20 +01:00
|
|
|
if (result && !thd->killed)
|
2008-02-08 13:53:57 +01:00
|
|
|
sql_print_error("Failed to write to mysql.slow_log: %s",
|
|
|
|
error_handler.message());
|
2007-10-12 01:55:18 +02:00
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
if (need_rnd_end)
|
|
|
|
{
|
|
|
|
table->file->ha_rnd_end();
|
|
|
|
table->file->ha_release_auto_increment();
|
|
|
|
}
|
|
|
|
if (need_close)
|
|
|
|
close_performance_schema_table(thd, & open_tables_backup);
|
|
|
|
thd->time_zone_used= save_time_zone_used;
|
|
|
|
DBUG_RETURN(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
int Log_to_csv_event_handler::
|
|
|
|
activate_log(THD *thd, uint log_table_type)
|
|
|
|
{
|
|
|
|
TABLE_LIST table_list;
|
|
|
|
TABLE *table;
|
2009-12-08 10:57:07 +01:00
|
|
|
LEX_STRING *UNINIT_VAR(log_name);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
int result;
|
2010-01-21 21:43:03 +01:00
|
|
|
Open_tables_backup open_tables_backup;
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
|
|
|
|
DBUG_ENTER("Log_to_csv_event_handler::activate_log");
|
|
|
|
|
|
|
|
if (log_table_type == QUERY_LOG_GENERAL)
|
|
|
|
{
|
2009-12-08 10:57:07 +01:00
|
|
|
log_name= &GENERAL_LOG_NAME;
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(log_table_type == QUERY_LOG_SLOW);
|
|
|
|
|
2009-12-08 10:57:07 +01:00
|
|
|
log_name= &SLOW_LOG_NAME;
|
|
|
|
}
|
|
|
|
table_list.init_one_table(MYSQL_SCHEMA_NAME.str, MYSQL_SCHEMA_NAME.length,
|
|
|
|
log_name->str, log_name->length, log_name->str,
|
|
|
|
TL_WRITE_CONCURRENT_INSERT);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
|
|
|
|
table= open_performance_schema_table(thd, & table_list,
|
|
|
|
& open_tables_backup);
|
2007-08-30 02:56:00 +02:00
|
|
|
if (table)
|
|
|
|
{
|
|
|
|
result= 0;
|
|
|
|
close_performance_schema_table(thd, & open_tables_backup);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
result= 1;
|
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
DBUG_RETURN(result);
|
2006-01-19 03:56:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
bool Log_to_csv_event_handler::
|
|
|
|
log_error(enum loglevel level, const char *format, va_list args)
|
|
|
|
{
|
|
|
|
/* No log table is implemented */
|
|
|
|
DBUG_ASSERT(0);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool Log_to_file_event_handler::
|
|
|
|
log_error(enum loglevel level, const char *format,
|
|
|
|
va_list args)
|
|
|
|
{
|
|
|
|
return vprint_msg_to_log(level, format, args);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Log_to_file_event_handler::init_pthread_objects()
|
|
|
|
{
|
|
|
|
mysql_log.init_pthread_objects();
|
|
|
|
mysql_slow_log.init_pthread_objects();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/** Wrapper around MYSQL_LOG::write() for slow log. */
|
2006-01-19 03:56:06 +01:00
|
|
|
|
|
|
|
bool Log_to_file_event_handler::
|
|
|
|
log_slow(THD *thd, time_t current_time, time_t query_start_arg,
|
|
|
|
const char *user_host, uint user_host_len,
|
2007-07-30 10:33:50 +02:00
|
|
|
ulonglong query_utime, ulonglong lock_utime, bool is_command,
|
2006-01-19 03:56:06 +01:00
|
|
|
const char *sql_text, uint sql_text_len)
|
|
|
|
{
|
2008-05-21 14:44:30 +02:00
|
|
|
Silence_log_table_errors error_handler;
|
|
|
|
thd->push_internal_handler(&error_handler);
|
|
|
|
bool retval= mysql_slow_log.write(thd, current_time, query_start_arg,
|
|
|
|
user_host, user_host_len,
|
|
|
|
query_utime, lock_utime, is_command,
|
|
|
|
sql_text, sql_text_len);
|
|
|
|
thd->pop_internal_handler();
|
|
|
|
return retval;
|
2006-01-19 03:56:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2006-01-19 03:56:06 +01:00
|
|
|
Wrapper around MYSQL_LOG::write() for general log. We need it since we
|
|
|
|
want all log event handlers to have the same signature.
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool Log_to_file_event_handler::
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
log_general(THD *thd, time_t event_time, const char *user_host,
|
2006-01-19 03:56:06 +01:00
|
|
|
uint user_host_len, int thread_id,
|
|
|
|
const char *command_type, uint command_type_len,
|
2006-02-03 11:05:14 +01:00
|
|
|
const char *sql_text, uint sql_text_len,
|
|
|
|
CHARSET_INFO *client_cs)
|
2006-01-19 03:56:06 +01:00
|
|
|
{
|
2008-05-21 14:44:30 +02:00
|
|
|
Silence_log_table_errors error_handler;
|
|
|
|
thd->push_internal_handler(&error_handler);
|
|
|
|
bool retval= mysql_log.write(event_time, user_host, user_host_len,
|
|
|
|
thread_id, command_type, command_type_len,
|
|
|
|
sql_text, sql_text_len);
|
|
|
|
thd->pop_internal_handler();
|
|
|
|
return retval;
|
2006-01-19 03:56:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool Log_to_file_event_handler::init()
|
|
|
|
{
|
|
|
|
if (!is_initialized)
|
|
|
|
{
|
|
|
|
if (opt_slow_log)
|
2006-06-19 15:30:55 +02:00
|
|
|
mysql_slow_log.open_slow_log(sys_var_slow_log_path.value);
|
2006-01-19 03:56:06 +01:00
|
|
|
|
|
|
|
if (opt_log)
|
2006-06-19 15:30:55 +02:00
|
|
|
mysql_log.open_query_log(sys_var_general_log_path.value);
|
2006-01-19 03:56:06 +01:00
|
|
|
|
|
|
|
is_initialized= TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Log_to_file_event_handler::cleanup()
|
|
|
|
{
|
|
|
|
mysql_log.cleanup();
|
|
|
|
mysql_slow_log.cleanup();
|
|
|
|
}
|
|
|
|
|
|
|
|
void Log_to_file_event_handler::flush()
|
|
|
|
{
|
|
|
|
/* reopen log files */
|
2006-06-19 15:30:55 +02:00
|
|
|
if (opt_log)
|
2006-06-19 17:50:11 +02:00
|
|
|
mysql_log.reopen_file();
|
2006-06-19 15:30:55 +02:00
|
|
|
if (opt_slow_log)
|
2006-06-19 17:50:11 +02:00
|
|
|
mysql_slow_log.reopen_file();
|
2006-01-19 03:56:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Log error with all enabled log event handlers
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
error_log_print()
|
|
|
|
|
|
|
|
level The level of the error significance: NOTE,
|
|
|
|
WARNING or ERROR.
|
|
|
|
format format string for the error message
|
|
|
|
args list of arguments for the format string
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
FALSE - OK
|
|
|
|
TRUE - error occured
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool LOGGER::error_log_print(enum loglevel level, const char *format,
|
|
|
|
va_list args)
|
|
|
|
{
|
|
|
|
bool error= FALSE;
|
2007-07-30 10:33:50 +02:00
|
|
|
Log_event_handler **current_handler;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
|
|
|
/* currently we don't need locking here as there is no error_log table */
|
2007-07-30 10:33:50 +02:00
|
|
|
for (current_handler= error_log_handler_list ; *current_handler ;)
|
2006-01-19 03:56:06 +01:00
|
|
|
error= (*current_handler++)->log_error(level, format, args) || error;
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-01-27 14:10:40 +01:00
|
|
|
void LOGGER::cleanup_base()
|
2006-01-19 03:56:06 +01:00
|
|
|
{
|
|
|
|
DBUG_ASSERT(inited == 1);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
rwlock_destroy(&LOCK_logger);
|
2006-01-19 03:56:06 +01:00
|
|
|
if (table_log_handler)
|
2006-01-27 14:10:40 +01:00
|
|
|
{
|
2006-01-19 03:56:06 +01:00
|
|
|
table_log_handler->cleanup();
|
2006-01-27 14:10:40 +01:00
|
|
|
delete table_log_handler;
|
2009-04-09 17:25:25 +02:00
|
|
|
table_log_handler= NULL;
|
2006-01-27 14:10:40 +01:00
|
|
|
}
|
2006-01-19 03:56:06 +01:00
|
|
|
if (file_log_handler)
|
|
|
|
file_log_handler->cleanup();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-01-27 14:10:40 +01:00
|
|
|
void LOGGER::cleanup_end()
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(inited == 1);
|
|
|
|
if (file_log_handler)
|
2009-04-09 17:25:25 +02:00
|
|
|
{
|
2006-01-27 14:10:40 +01:00
|
|
|
delete file_log_handler;
|
2009-04-09 17:25:25 +02:00
|
|
|
file_log_handler=NULL;
|
|
|
|
}
|
|
|
|
inited= 0;
|
2006-01-27 14:10:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2006-01-19 03:56:06 +01:00
|
|
|
Perform basic log initialization: create file-based log handler and
|
|
|
|
init error log.
|
|
|
|
*/
|
|
|
|
void LOGGER::init_base()
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(inited == 0);
|
|
|
|
inited= 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Here we create file log handler. We don't do it for the table log handler
|
|
|
|
here as it cannot be created so early. The reason is THD initialization,
|
|
|
|
which depends on the system variables (parsed later).
|
|
|
|
*/
|
|
|
|
if (!file_log_handler)
|
|
|
|
file_log_handler= new Log_to_file_event_handler;
|
|
|
|
|
|
|
|
/* by default we use traditional error log */
|
2006-01-27 11:41:15 +01:00
|
|
|
init_error_log(LOG_FILE);
|
2006-01-19 03:56:06 +01:00
|
|
|
|
|
|
|
file_log_handler->init_pthread_objects();
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
my_rwlock_init(&LOCK_logger, NULL);
|
2006-01-19 03:56:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void LOGGER::init_log_tables()
|
|
|
|
{
|
|
|
|
if (!table_log_handler)
|
|
|
|
table_log_handler= new Log_to_csv_event_handler;
|
|
|
|
|
|
|
|
if (!is_log_tables_initialized &&
|
|
|
|
!table_log_handler->init() && !file_log_handler->init())
|
|
|
|
is_log_tables_initialized= TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-13 15:26:46 +02:00
|
|
|
bool LOGGER::flush_logs(THD *thd)
|
|
|
|
{
|
|
|
|
int rc= 0;
|
2006-04-18 06:43:13 +02:00
|
|
|
|
2006-06-19 15:30:55 +02:00
|
|
|
/*
|
2006-10-13 15:26:46 +02:00
|
|
|
Now we lock logger, as nobody should be able to use logging routines while
|
|
|
|
log tables are closed
|
2006-06-19 15:30:55 +02:00
|
|
|
*/
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
logger.lock_exclusive();
|
2006-06-19 15:30:55 +02:00
|
|
|
|
|
|
|
/* reopen log files */
|
|
|
|
file_log_handler->flush();
|
2006-04-18 06:43:13 +02:00
|
|
|
|
2006-06-19 15:30:55 +02:00
|
|
|
/* end of log flush */
|
|
|
|
logger.unlock();
|
2006-10-13 15:26:46 +02:00
|
|
|
return rc;
|
2006-01-19 03:56:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Log slow query with all enabled log event handlers
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
slow_log_print()
|
|
|
|
|
2007-07-30 10:33:50 +02:00
|
|
|
thd THD of the query being logged
|
|
|
|
query The query being logged
|
|
|
|
query_length The length of the query string
|
|
|
|
current_utime Current time in microseconds (from undefined start)
|
2006-01-19 03:56:06 +01:00
|
|
|
|
|
|
|
RETURN
|
2007-07-30 10:33:50 +02:00
|
|
|
FALSE OK
|
|
|
|
TRUE error occured
|
2006-01-19 03:56:06 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
bool LOGGER::slow_log_print(THD *thd, const char *query, uint query_length,
|
2007-07-30 10:33:50 +02:00
|
|
|
ulonglong current_utime)
|
|
|
|
|
2006-01-19 03:56:06 +01:00
|
|
|
{
|
|
|
|
bool error= FALSE;
|
2007-07-30 10:33:50 +02:00
|
|
|
Log_event_handler **current_handler;
|
2006-01-19 03:56:06 +01:00
|
|
|
bool is_command= FALSE;
|
2009-06-19 10:24:43 +02:00
|
|
|
char user_host_buff[MAX_USER_HOST_SIZE + 1];
|
2006-01-19 03:56:06 +01:00
|
|
|
Security_context *sctx= thd->security_ctx;
|
2007-01-29 00:47:35 +01:00
|
|
|
uint user_host_len= 0;
|
2007-07-30 10:33:50 +02:00
|
|
|
ulonglong query_utime, lock_utime;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2009-09-29 16:09:01 +02:00
|
|
|
DBUG_ASSERT(thd->enable_slow_log);
|
2006-01-19 03:56:06 +01:00
|
|
|
/*
|
|
|
|
Print the message to the buffer if we have slow log enabled
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (*slow_log_handler_list)
|
|
|
|
{
|
2007-07-30 10:33:50 +02:00
|
|
|
time_t current_time;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2006-03-04 09:20:56 +01:00
|
|
|
/* do not log slow queries from replication threads */
|
2007-07-30 10:33:50 +02:00
|
|
|
if (thd->slave_thread && !opt_log_slow_slave_statements)
|
2006-01-19 03:56:06 +01:00
|
|
|
return 0;
|
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
lock_shared();
|
2006-06-19 15:30:55 +02:00
|
|
|
if (!opt_slow_log)
|
|
|
|
{
|
|
|
|
unlock();
|
|
|
|
return 0;
|
|
|
|
}
|
2006-01-19 03:56:06 +01:00
|
|
|
|
|
|
|
/* fill in user_host value: the format is "%s[%s] @ %s [%s]" */
|
2007-07-30 10:33:50 +02:00
|
|
|
user_host_len= (strxnmov(user_host_buff, MAX_USER_HOST_SIZE,
|
|
|
|
sctx->priv_user ? sctx->priv_user : "", "[",
|
|
|
|
sctx->user ? sctx->user : "", "] @ ",
|
|
|
|
sctx->host ? sctx->host : "", " [",
|
|
|
|
sctx->ip ? sctx->ip : "", "]", NullS) -
|
|
|
|
user_host_buff);
|
|
|
|
|
|
|
|
current_time= my_time_possible_from_micro(current_utime);
|
|
|
|
if (thd->start_utime)
|
2006-01-19 03:56:06 +01:00
|
|
|
{
|
2007-07-30 10:33:50 +02:00
|
|
|
query_utime= (current_utime - thd->start_utime);
|
|
|
|
lock_utime= (thd->utime_after_lock - thd->start_utime);
|
|
|
|
}
|
|
|
|
else
|
2006-01-19 03:56:06 +01:00
|
|
|
{
|
2007-07-30 10:33:50 +02:00
|
|
|
query_utime= lock_utime= 0;
|
2006-01-19 03:56:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!query)
|
|
|
|
{
|
|
|
|
is_command= TRUE;
|
|
|
|
query= command_name[thd->command].str;
|
|
|
|
query_length= command_name[thd->command].length;
|
|
|
|
}
|
|
|
|
|
2007-07-30 10:33:50 +02:00
|
|
|
for (current_handler= slow_log_handler_list; *current_handler ;)
|
|
|
|
error= (*current_handler++)->log_slow(thd, current_time, thd->start_time,
|
2006-01-19 03:56:06 +01:00
|
|
|
user_host_buff, user_host_len,
|
2007-07-30 10:33:50 +02:00
|
|
|
query_utime, lock_utime, is_command,
|
2006-01-19 03:56:06 +01:00
|
|
|
query, query_length) || error;
|
|
|
|
|
|
|
|
unlock();
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2007-10-18 20:45:07 +02:00
|
|
|
bool LOGGER::general_log_write(THD *thd, enum enum_server_command command,
|
|
|
|
const char *query, uint query_length)
|
2006-01-19 03:56:06 +01:00
|
|
|
{
|
|
|
|
bool error= FALSE;
|
|
|
|
Log_event_handler **current_handler= general_log_handler_list;
|
2009-06-19 10:24:43 +02:00
|
|
|
char user_host_buff[MAX_USER_HOST_SIZE + 1];
|
2007-10-18 20:45:07 +02:00
|
|
|
Security_context *sctx= thd->security_ctx;
|
|
|
|
uint user_host_len= 0;
|
|
|
|
time_t current_time;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2009-09-11 19:06:27 +02:00
|
|
|
DBUG_ASSERT(thd);
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2007-10-18 20:45:07 +02:00
|
|
|
lock_shared();
|
|
|
|
if (!opt_log)
|
|
|
|
{
|
2006-01-19 03:56:06 +01:00
|
|
|
unlock();
|
2007-10-18 20:45:07 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
user_host_len= strxnmov(user_host_buff, MAX_USER_HOST_SIZE,
|
|
|
|
sctx->priv_user ? sctx->priv_user : "", "[",
|
|
|
|
sctx->user ? sctx->user : "", "] @ ",
|
|
|
|
sctx->host ? sctx->host : "", " [",
|
|
|
|
sctx->ip ? sctx->ip : "", "]", NullS) -
|
|
|
|
user_host_buff;
|
|
|
|
|
|
|
|
current_time= my_time(0);
|
|
|
|
while (*current_handler)
|
2008-03-23 13:29:35 +01:00
|
|
|
error|= (*current_handler++)->
|
2007-10-18 20:45:07 +02:00
|
|
|
log_general(thd, current_time, user_host_buff,
|
2009-09-11 19:06:27 +02:00
|
|
|
user_host_len, thd->thread_id,
|
2007-10-18 20:45:07 +02:00
|
|
|
command_name[(uint) command].str,
|
|
|
|
command_name[(uint) command].length,
|
|
|
|
query, query_length,
|
|
|
|
thd->variables.character_set_client) || error;
|
|
|
|
unlock();
|
|
|
|
|
2006-01-19 03:56:06 +01:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2007-10-18 20:45:07 +02:00
|
|
|
bool LOGGER::general_log_print(THD *thd, enum enum_server_command command,
|
|
|
|
const char *format, va_list args)
|
|
|
|
{
|
|
|
|
uint message_buff_len= 0;
|
|
|
|
char message_buff[MAX_LOG_BUFFER_SIZE];
|
|
|
|
|
|
|
|
/* prepare message */
|
|
|
|
if (format)
|
|
|
|
message_buff_len= my_vsnprintf(message_buff, sizeof(message_buff),
|
|
|
|
format, args);
|
|
|
|
else
|
|
|
|
message_buff[0]= '\0';
|
|
|
|
|
|
|
|
return general_log_write(thd, command, message_buff, message_buff_len);
|
|
|
|
}
|
|
|
|
|
2006-01-27 11:41:15 +01:00
|
|
|
void LOGGER::init_error_log(uint error_log_printer)
|
2006-01-19 03:56:06 +01:00
|
|
|
{
|
2006-01-27 11:41:15 +01:00
|
|
|
if (error_log_printer & LOG_NONE)
|
|
|
|
{
|
2006-01-19 03:56:06 +01:00
|
|
|
error_log_handler_list[0]= 0;
|
2006-01-27 11:41:15 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (error_log_printer) {
|
|
|
|
case LOG_FILE:
|
2006-01-19 03:56:06 +01:00
|
|
|
error_log_handler_list[0]= file_log_handler;
|
|
|
|
error_log_handler_list[1]= 0;
|
|
|
|
break;
|
|
|
|
/* these two are disabled for now */
|
2006-01-27 11:41:15 +01:00
|
|
|
case LOG_TABLE:
|
2006-01-19 03:56:06 +01:00
|
|
|
DBUG_ASSERT(0);
|
|
|
|
break;
|
2006-01-27 11:41:15 +01:00
|
|
|
case LOG_TABLE|LOG_FILE:
|
2006-01-19 03:56:06 +01:00
|
|
|
DBUG_ASSERT(0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-01-27 11:41:15 +01:00
|
|
|
void LOGGER::init_slow_log(uint slow_log_printer)
|
2006-01-19 03:56:06 +01:00
|
|
|
{
|
2006-01-27 11:41:15 +01:00
|
|
|
if (slow_log_printer & LOG_NONE)
|
|
|
|
{
|
2006-01-19 03:56:06 +01:00
|
|
|
slow_log_handler_list[0]= 0;
|
2006-01-27 11:41:15 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (slow_log_printer) {
|
|
|
|
case LOG_FILE:
|
2006-01-19 03:56:06 +01:00
|
|
|
slow_log_handler_list[0]= file_log_handler;
|
|
|
|
slow_log_handler_list[1]= 0;
|
|
|
|
break;
|
2006-01-27 11:41:15 +01:00
|
|
|
case LOG_TABLE:
|
2006-01-19 03:56:06 +01:00
|
|
|
slow_log_handler_list[0]= table_log_handler;
|
|
|
|
slow_log_handler_list[1]= 0;
|
|
|
|
break;
|
2006-01-27 11:41:15 +01:00
|
|
|
case LOG_TABLE|LOG_FILE:
|
2006-01-19 03:56:06 +01:00
|
|
|
slow_log_handler_list[0]= file_log_handler;
|
|
|
|
slow_log_handler_list[1]= table_log_handler;
|
|
|
|
slow_log_handler_list[2]= 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-01-27 11:41:15 +01:00
|
|
|
void LOGGER::init_general_log(uint general_log_printer)
|
2006-01-19 03:56:06 +01:00
|
|
|
{
|
2006-01-27 11:41:15 +01:00
|
|
|
if (general_log_printer & LOG_NONE)
|
|
|
|
{
|
2006-01-19 03:56:06 +01:00
|
|
|
general_log_handler_list[0]= 0;
|
2006-01-27 11:41:15 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (general_log_printer) {
|
|
|
|
case LOG_FILE:
|
2006-01-19 03:56:06 +01:00
|
|
|
general_log_handler_list[0]= file_log_handler;
|
|
|
|
general_log_handler_list[1]= 0;
|
|
|
|
break;
|
2006-01-27 11:41:15 +01:00
|
|
|
case LOG_TABLE:
|
2006-01-19 03:56:06 +01:00
|
|
|
general_log_handler_list[0]= table_log_handler;
|
|
|
|
general_log_handler_list[1]= 0;
|
|
|
|
break;
|
2006-01-27 11:41:15 +01:00
|
|
|
case LOG_TABLE|LOG_FILE:
|
2006-01-19 03:56:06 +01:00
|
|
|
general_log_handler_list[0]= file_log_handler;
|
|
|
|
general_log_handler_list[1]= table_log_handler;
|
|
|
|
general_log_handler_list[2]= 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-06-19 15:30:55 +02:00
|
|
|
bool LOGGER::activate_log_handler(THD* thd, uint log_type)
|
|
|
|
{
|
2007-07-31 07:01:44 +02:00
|
|
|
MYSQL_QUERY_LOG *file_log;
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
bool res= FALSE;
|
|
|
|
lock_exclusive();
|
2006-06-19 15:30:55 +02:00
|
|
|
switch (log_type) {
|
|
|
|
case QUERY_LOG_SLOW:
|
|
|
|
if (!opt_slow_log)
|
|
|
|
{
|
2007-07-31 07:01:44 +02:00
|
|
|
file_log= file_log_handler->get_mysql_slow_log();
|
|
|
|
|
|
|
|
file_log->open_slow_log(sys_var_slow_log_path.value);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
if (table_log_handler->activate_log(thd, QUERY_LOG_SLOW))
|
|
|
|
{
|
|
|
|
/* Error printed by open table in activate_log() */
|
|
|
|
res= TRUE;
|
2007-07-31 07:01:44 +02:00
|
|
|
file_log->close(0);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
}
|
|
|
|
else
|
2007-07-31 07:01:44 +02:00
|
|
|
{
|
|
|
|
init_slow_log(log_output_options);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
opt_slow_log= TRUE;
|
2007-07-31 07:01:44 +02:00
|
|
|
}
|
2006-06-19 15:30:55 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case QUERY_LOG_GENERAL:
|
|
|
|
if (!opt_log)
|
|
|
|
{
|
2007-07-31 07:01:44 +02:00
|
|
|
file_log= file_log_handler->get_mysql_log();
|
|
|
|
|
|
|
|
file_log->open_query_log(sys_var_general_log_path.value);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
if (table_log_handler->activate_log(thd, QUERY_LOG_GENERAL))
|
|
|
|
{
|
|
|
|
/* Error printed by open table in activate_log() */
|
|
|
|
res= TRUE;
|
2007-07-31 07:01:44 +02:00
|
|
|
file_log->close(0);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
}
|
|
|
|
else
|
2007-07-31 07:01:44 +02:00
|
|
|
{
|
|
|
|
init_general_log(log_output_options);
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
opt_log= TRUE;
|
2007-07-31 07:01:44 +02:00
|
|
|
}
|
2006-06-19 15:30:55 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
DBUG_ASSERT(0);
|
|
|
|
}
|
|
|
|
unlock();
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void LOGGER::deactivate_log_handler(THD *thd, uint log_type)
|
|
|
|
{
|
|
|
|
my_bool *tmp_opt= 0;
|
|
|
|
MYSQL_LOG *file_log;
|
|
|
|
|
|
|
|
switch (log_type) {
|
|
|
|
case QUERY_LOG_SLOW:
|
|
|
|
tmp_opt= &opt_slow_log;
|
|
|
|
file_log= file_log_handler->get_mysql_slow_log();
|
|
|
|
break;
|
|
|
|
case QUERY_LOG_GENERAL:
|
|
|
|
tmp_opt= &opt_log;
|
|
|
|
file_log= file_log_handler->get_mysql_log();
|
|
|
|
break;
|
|
|
|
default:
|
2007-02-23 12:13:55 +01:00
|
|
|
assert(0); // Impossible
|
2006-06-19 15:30:55 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!(*tmp_opt))
|
|
|
|
return;
|
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
lock_exclusive();
|
2006-06-19 15:30:55 +02:00
|
|
|
file_log->close(0);
|
|
|
|
*tmp_opt= FALSE;
|
|
|
|
unlock();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-01-19 03:56:06 +01:00
|
|
|
/* the parameters are unused for the log tables */
|
|
|
|
bool Log_to_csv_event_handler::init()
|
|
|
|
{
|
2006-06-19 15:30:55 +02:00
|
|
|
return 0;
|
2006-01-19 03:56:06 +01:00
|
|
|
}
|
|
|
|
|
2006-01-27 11:41:15 +01:00
|
|
|
int LOGGER::set_handlers(uint error_log_printer,
|
|
|
|
uint slow_log_printer,
|
|
|
|
uint general_log_printer)
|
2006-01-19 03:56:06 +01:00
|
|
|
{
|
|
|
|
/* error log table is not supported yet */
|
2006-01-27 11:41:15 +01:00
|
|
|
DBUG_ASSERT(error_log_printer < LOG_TABLE);
|
2006-01-19 03:56:06 +01:00
|
|
|
|
WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)
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.
2007-07-27 08:31:06 +02:00
|
|
|
lock_exclusive();
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2006-01-27 11:41:15 +01:00
|
|
|
if ((slow_log_printer & LOG_TABLE || general_log_printer & LOG_TABLE) &&
|
2006-01-19 03:56:06 +01:00
|
|
|
!is_log_tables_initialized)
|
|
|
|
{
|
2006-01-27 11:41:15 +01:00
|
|
|
slow_log_printer= (slow_log_printer & ~LOG_TABLE) | LOG_FILE;
|
|
|
|
general_log_printer= (general_log_printer & ~LOG_TABLE) | LOG_FILE;
|
2006-01-19 03:56:06 +01:00
|
|
|
|
|
|
|
sql_print_error("Failed to initialize log tables. "
|
|
|
|
"Falling back to the old-fashioned logs");
|
|
|
|
}
|
|
|
|
|
|
|
|
init_error_log(error_log_printer);
|
|
|
|
init_slow_log(slow_log_printer);
|
|
|
|
init_general_log(general_log_printer);
|
|
|
|
|
|
|
|
unlock();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-08-27 01:13:03 +02:00
|
|
|
/**
|
|
|
|
This function checks if a transactional talbe was updated by the
|
|
|
|
current statement.
|
|
|
|
|
|
|
|
@param thd The client thread that executed the current statement.
|
|
|
|
@return
|
|
|
|
@c true if a transactional table was updated, @false otherwise.
|
|
|
|
*/
|
|
|
|
static bool stmt_has_updated_trans_table(THD *thd)
|
|
|
|
{
|
|
|
|
Ha_trx_info *ha_info;
|
|
|
|
|
2009-10-06 02:54:00 +02:00
|
|
|
for (ha_info= thd->transaction.stmt.ha_list; ha_info && ha_info->is_started(); ha_info= ha_info->next())
|
2009-08-27 01:13:03 +02:00
|
|
|
{
|
|
|
|
if (ha_info->is_trx_read_write() && ha_info->ht() != binlog_hton)
|
|
|
|
return (TRUE);
|
|
|
|
}
|
|
|
|
return (FALSE);
|
|
|
|
}
|
2006-01-19 03:56:06 +01:00
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
/*
|
|
|
|
Save position of binary log transaction cache.
|
|
|
|
|
|
|
|
SYNPOSIS
|
|
|
|
binlog_trans_log_savepos()
|
|
|
|
|
|
|
|
thd The thread to take the binlog data from
|
|
|
|
pos Pointer to variable where the position will be stored
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
Save the current position in the binary log transaction cache into
|
|
|
|
the variable pointed to by 'pos'
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void
|
|
|
|
binlog_trans_log_savepos(THD *thd, my_off_t *pos)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("binlog_trans_log_savepos");
|
|
|
|
DBUG_ASSERT(pos != NULL);
|
2007-08-31 08:19:52 +02:00
|
|
|
if (thd_get_ha_data(thd, binlog_hton) == NULL)
|
2006-10-05 10:46:14 +02:00
|
|
|
thd->binlog_setup_trx_data();
|
|
|
|
binlog_trx_data *const trx_data=
|
2007-08-31 08:19:52 +02:00
|
|
|
(binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);
|
2006-10-05 10:46:14 +02:00
|
|
|
DBUG_ASSERT(mysql_bin_log.is_open());
|
|
|
|
*pos= trx_data->position();
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("return", ("*pos: %lu", (ulong) *pos));
|
2006-10-05 10:46:14 +02:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Truncate the binary log transaction cache.
|
|
|
|
|
|
|
|
SYNPOSIS
|
|
|
|
binlog_trans_log_truncate()
|
|
|
|
|
|
|
|
thd The thread to take the binlog data from
|
|
|
|
pos Position to truncate to
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
Truncate the binary log to the given position. Will not change
|
|
|
|
anything else.
|
|
|
|
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
binlog_trans_log_truncate(THD *thd, my_off_t pos)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("binlog_trans_log_truncate");
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("enter", ("pos: %lu", (ulong) pos));
|
2006-10-05 10:46:14 +02:00
|
|
|
|
2007-08-31 08:19:52 +02:00
|
|
|
DBUG_ASSERT(thd_get_ha_data(thd, binlog_hton) != NULL);
|
2006-10-05 10:46:14 +02:00
|
|
|
/* Only true if binlog_trans_log_savepos() wasn't called before */
|
|
|
|
DBUG_ASSERT(pos != ~(my_off_t) 0);
|
|
|
|
|
|
|
|
binlog_trx_data *const trx_data=
|
2007-08-31 08:19:52 +02:00
|
|
|
(binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);
|
2006-10-05 10:46:14 +02:00
|
|
|
trx_data->truncate(pos);
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
/*
|
|
|
|
this function is mostly a placeholder.
|
2006-05-05 08:45:58 +02:00
|
|
|
conceptually, binlog initialization (now mostly done in MYSQL_BIN_LOG::open)
|
2005-01-16 13:16:23 +01:00
|
|
|
should be moved here.
|
|
|
|
*/
|
|
|
|
|
2006-09-15 19:28:00 +02:00
|
|
|
int binlog_init(void *p)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2006-09-15 19:28:00 +02:00
|
|
|
binlog_hton= (handlerton *)p;
|
|
|
|
binlog_hton->state=opt_bin_log ? SHOW_OPTION_YES : SHOW_OPTION_NO;
|
|
|
|
binlog_hton->db_type=DB_TYPE_BINLOG;
|
|
|
|
binlog_hton->savepoint_offset= sizeof(my_off_t);
|
|
|
|
binlog_hton->close_connection= binlog_close_connection;
|
|
|
|
binlog_hton->savepoint_set= binlog_savepoint_set;
|
|
|
|
binlog_hton->savepoint_rollback= binlog_savepoint_rollback;
|
|
|
|
binlog_hton->commit= binlog_commit;
|
|
|
|
binlog_hton->rollback= binlog_rollback;
|
|
|
|
binlog_hton->prepare= binlog_prepare;
|
|
|
|
binlog_hton->flags= HTON_NOT_USER_SELECTABLE | HTON_HIDDEN;
|
2006-05-28 14:51:01 +02:00
|
|
|
return 0;
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
|
|
|
|
2006-09-30 21:49:46 +02:00
|
|
|
static int binlog_close_connection(handlerton *hton, THD *thd)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2005-12-22 06:39:02 +01:00
|
|
|
binlog_trx_data *const trx_data=
|
2007-08-31 08:19:52 +02:00
|
|
|
(binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);
|
2007-07-04 10:46:45 +02:00
|
|
|
DBUG_ASSERT(trx_data->empty());
|
2007-08-31 08:19:52 +02:00
|
|
|
thd_set_ha_data(thd, binlog_hton, NULL);
|
2006-10-05 10:46:14 +02:00
|
|
|
trx_data->~binlog_trx_data();
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free((uchar*)trx_data, MYF(0));
|
2005-01-16 13:16:23 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
/*
|
|
|
|
End a transaction.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
binlog_end_trans()
|
|
|
|
|
|
|
|
thd The thread whose transaction should be ended
|
|
|
|
trx_data Pointer to the transaction data to use
|
|
|
|
end_ev The end event to use, or NULL
|
|
|
|
all True if the entire transaction should be ended, false if
|
|
|
|
only the statement transaction should be ended.
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
End the currently open transaction. The transaction can be either
|
|
|
|
a real transaction (if 'all' is true) or a statement transaction
|
|
|
|
(if 'all' is false).
|
|
|
|
|
|
|
|
If 'end_ev' is NULL, the transaction is a rollback of only
|
|
|
|
transactional tables, so the transaction cache will be truncated
|
|
|
|
to either just before the last opened statement transaction (if
|
|
|
|
'all' is false), or reset completely (if 'all' is true).
|
|
|
|
*/
|
2005-12-22 06:39:02 +01:00
|
|
|
static int
|
2006-10-05 10:46:14 +02:00
|
|
|
binlog_end_trans(THD *thd, binlog_trx_data *trx_data,
|
|
|
|
Log_event *end_ev, bool all)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2005-02-23 18:26:49 +01:00
|
|
|
DBUG_ENTER("binlog_end_trans");
|
2005-12-22 06:39:02 +01:00
|
|
|
int error=0;
|
|
|
|
IO_CACHE *trans_log= &trx_data->trans_log;
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("enter", ("transaction: %s end_ev: 0x%lx",
|
|
|
|
all ? "all" : "stmt", (long) end_ev));
|
2006-10-05 10:46:14 +02:00
|
|
|
DBUG_PRINT("info", ("thd->options={ %s%s}",
|
|
|
|
FLAGSTR(thd->options, OPTION_NOT_AUTOCOMMIT),
|
|
|
|
FLAGSTR(thd->options, OPTION_BEGIN)));
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
/*
|
|
|
|
NULL denotes ROLLBACK with nothing to replicate: i.e., rollback of
|
|
|
|
only transactional tables. If the transaction contain changes to
|
|
|
|
any non-transactiona tables, we need write the transaction and log
|
|
|
|
a ROLLBACK last.
|
|
|
|
*/
|
2006-07-03 17:35:58 +02:00
|
|
|
if (end_ev != NULL)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
if (thd->binlog_flush_pending_rows_event(TRUE))
|
|
|
|
DBUG_RETURN(1);
|
2006-02-16 08:30:53 +01:00
|
|
|
/*
|
2006-10-05 10:46:14 +02:00
|
|
|
Doing a commit or a rollback including non-transactional tables,
|
|
|
|
i.e., ending a transaction where we might write the transaction
|
|
|
|
cache to the binary log.
|
|
|
|
|
2006-02-16 08:30:53 +01:00
|
|
|
We can always end the statement when ending a transaction since
|
|
|
|
transactions are not allowed inside stored functions. If they
|
|
|
|
were, we would have to ensure that we're not ending a statement
|
|
|
|
inside a stored function.
|
|
|
|
*/
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
error= mysql_bin_log.write(thd, &trx_data->trans_log, end_ev,
|
|
|
|
trx_data->has_incident());
|
2008-03-28 13:16:41 +01:00
|
|
|
trx_data->reset();
|
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
/*
|
2008-03-28 13:16:41 +01:00
|
|
|
We need to step the table map version after writing the
|
|
|
|
transaction cache to disk.
|
|
|
|
*/
|
|
|
|
mysql_bin_log.update_table_map_version();
|
|
|
|
statistic_increment(binlog_cache_use, &LOCK_status);
|
|
|
|
if (trans_log->disk_writes != 0)
|
2006-10-05 10:46:14 +02:00
|
|
|
{
|
2008-03-28 13:16:41 +01:00
|
|
|
statistic_increment(binlog_cache_disk_use, &LOCK_status);
|
|
|
|
trans_log->disk_writes= 0;
|
2006-10-05 10:46:14 +02:00
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-10-05 10:46:14 +02:00
|
|
|
/*
|
|
|
|
If rolling back an entire transaction or a single statement not
|
|
|
|
inside a transaction, we reset the transaction cache.
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
If rolling back a statement in a transaction, we truncate the
|
|
|
|
transaction cache to remove the statement.
|
|
|
|
*/
|
2008-09-03 22:04:07 +02:00
|
|
|
thd->binlog_remove_pending_rows_event(TRUE);
|
2009-12-03 23:46:14 +01:00
|
|
|
if (all || !thd->in_multi_stmt_transaction())
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
{
|
|
|
|
if (trx_data->has_incident())
|
|
|
|
mysql_bin_log.write_incident(thd, TRUE);
|
2006-10-05 10:46:14 +02:00
|
|
|
trx_data->reset();
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
}
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
else // ...statement
|
|
|
|
trx_data->truncate(trx_data->before_stmt_pos);
|
2006-10-05 10:46:14 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
We need to step the table map version on a rollback to ensure
|
|
|
|
that a new table map event is generated instead of the one that
|
|
|
|
was written to the thrown-away transaction cache.
|
|
|
|
*/
|
|
|
|
mysql_bin_log.update_table_map_version();
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
2006-10-05 10:46:14 +02:00
|
|
|
|
2008-12-02 18:32:07 +01:00
|
|
|
DBUG_ASSERT(thd->binlog_get_pending_rows_event() == NULL);
|
2005-02-23 18:26:49 +01:00
|
|
|
DBUG_RETURN(error);
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
|
|
|
|
2006-09-30 21:49:46 +02:00
|
|
|
static int binlog_prepare(handlerton *hton, THD *thd, bool all)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
do nothing.
|
|
|
|
just pretend we can do 2pc, so that MySQL won't
|
|
|
|
switch to 1pc.
|
2007-01-27 02:46:45 +01:00
|
|
|
real work will be done in MYSQL_BIN_LOG::log_xid()
|
2005-01-16 13:16:23 +01:00
|
|
|
*/
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-12-14 14:40:45 +01:00
|
|
|
/**
|
|
|
|
This function is called once after each statement.
|
|
|
|
|
|
|
|
It has the responsibility to flush the transaction cache to the
|
|
|
|
binlog file on commits.
|
|
|
|
|
|
|
|
@param hton The binlog handlerton.
|
|
|
|
@param thd The client thread that executes the transaction.
|
2008-03-28 13:16:41 +01:00
|
|
|
@param all This is @c true if this is a real transaction commit, and
|
|
|
|
@false otherwise.
|
2007-12-14 14:40:45 +01:00
|
|
|
|
|
|
|
@see handlerton::commit
|
|
|
|
*/
|
2006-09-30 21:49:46 +02:00
|
|
|
static int binlog_commit(handlerton *hton, THD *thd, bool all)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2008-12-02 18:32:07 +01:00
|
|
|
int error= 0;
|
2005-01-16 13:16:23 +01:00
|
|
|
DBUG_ENTER("binlog_commit");
|
2005-12-22 06:39:02 +01:00
|
|
|
binlog_trx_data *const trx_data=
|
2007-08-31 08:19:52 +02:00
|
|
|
(binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2007-03-20 09:50:10 +01:00
|
|
|
if (trx_data->empty())
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2007-01-27 02:46:45 +01:00
|
|
|
// we're here because trans_log was flushed in MYSQL_BIN_LOG::log_xid()
|
2006-10-05 10:46:14 +02:00
|
|
|
trx_data->reset();
|
2005-01-16 13:16:23 +01:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
2008-03-28 13:16:41 +01:00
|
|
|
|
2007-12-14 14:40:45 +01:00
|
|
|
/*
|
2008-12-03 20:55:49 +01:00
|
|
|
We commit the transaction if:
|
2008-03-28 13:16:41 +01:00
|
|
|
|
2008-12-03 20:55:49 +01:00
|
|
|
- We are not in a transaction and committing a statement, or
|
2008-03-28 13:16:41 +01:00
|
|
|
|
2008-12-03 20:55:49 +01:00
|
|
|
- We are in a transaction and a full transaction is committed
|
2008-03-28 13:16:41 +01:00
|
|
|
|
|
|
|
Otherwise, we accumulate the statement
|
2007-12-14 14:40:45 +01:00
|
|
|
*/
|
2009-12-03 23:46:14 +01:00
|
|
|
bool const in_transaction= thd->in_multi_stmt_transaction();
|
2008-03-28 13:16:41 +01:00
|
|
|
DBUG_PRINT("debug",
|
|
|
|
("all: %d, empty: %s, in_transaction: %s, all.modified_non_trans_table: %s, stmt.modified_non_trans_table: %s",
|
|
|
|
all,
|
|
|
|
YESNO(trx_data->empty()),
|
|
|
|
YESNO(in_transaction),
|
|
|
|
YESNO(thd->transaction.all.modified_non_trans_table),
|
|
|
|
YESNO(thd->transaction.stmt.modified_non_trans_table)));
|
2009-10-06 02:54:00 +02:00
|
|
|
if (!in_transaction || all ||
|
|
|
|
(!all && !trx_data->at_least_one_stmt_committed &&
|
|
|
|
!stmt_has_updated_trans_table(thd) &&
|
|
|
|
thd->transaction.stmt.modified_non_trans_table))
|
2006-07-03 17:35:58 +02:00
|
|
|
{
|
2009-05-31 11:15:35 +02:00
|
|
|
Query_log_event qev(thd, STRING_WITH_LEN("COMMIT"), TRUE, TRUE, 0);
|
2008-12-02 18:32:07 +01:00
|
|
|
error= binlog_end_trans(thd, trx_data, &qev, all);
|
2006-07-03 17:35:58 +02:00
|
|
|
}
|
2008-12-02 18:32:07 +01:00
|
|
|
|
2009-10-06 02:38:58 +02:00
|
|
|
trx_data->at_least_one_stmt_committed = my_b_tell(&trx_data->trans_log) > 0;
|
|
|
|
|
2008-12-02 18:32:07 +01:00
|
|
|
if (!all)
|
|
|
|
trx_data->before_stmt_pos = MY_OFF_T_UNDEF; // part of the stmt commit
|
|
|
|
DBUG_RETURN(error);
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
|
|
|
|
2007-12-14 14:40:45 +01:00
|
|
|
/**
|
|
|
|
This function is called when a transaction involving a transactional
|
|
|
|
table is rolled back.
|
|
|
|
|
|
|
|
It has the responsibility to flush the transaction cache to the
|
|
|
|
binlog file. However, if the transaction does not involve
|
|
|
|
non-transactional tables, nothing needs to be logged.
|
|
|
|
|
|
|
|
@param hton The binlog handlerton.
|
|
|
|
@param thd The client thread that executes the transaction.
|
2008-03-28 13:16:41 +01:00
|
|
|
@param all This is @c true if this is a real transaction rollback, and
|
|
|
|
@false otherwise.
|
2007-12-14 14:40:45 +01:00
|
|
|
|
|
|
|
@see handlerton::rollback
|
|
|
|
*/
|
2006-09-30 21:49:46 +02:00
|
|
|
static int binlog_rollback(handlerton *hton, THD *thd, bool all)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
DBUG_ENTER("binlog_rollback");
|
2005-12-22 06:39:02 +01:00
|
|
|
int error=0;
|
|
|
|
binlog_trx_data *const trx_data=
|
2007-08-31 08:19:52 +02:00
|
|
|
(binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);
|
2006-10-05 10:46:14 +02:00
|
|
|
|
|
|
|
if (trx_data->empty()) {
|
|
|
|
trx_data->reset();
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2008-03-28 13:16:41 +01:00
|
|
|
DBUG_PRINT("debug", ("all: %s, all.modified_non_trans_table: %s, stmt.modified_non_trans_table: %s",
|
|
|
|
YESNO(all),
|
|
|
|
YESNO(thd->transaction.all.modified_non_trans_table),
|
|
|
|
YESNO(thd->transaction.stmt.modified_non_trans_table)));
|
2009-07-18 22:07:56 +02:00
|
|
|
if (mysql_bin_log.check_write_error(thd))
|
2005-02-09 20:04:28 +01:00
|
|
|
{
|
2008-03-28 13:16:41 +01:00
|
|
|
/*
|
2009-07-18 22:07:56 +02:00
|
|
|
"all == true" means that a "rollback statement" triggered the error and
|
|
|
|
this function was called. However, this must not happen as a rollback
|
|
|
|
is written directly to the binary log. And in auto-commit mode, a single
|
|
|
|
statement that is rolled back has the flag all == false.
|
2008-03-28 13:16:41 +01:00
|
|
|
*/
|
2009-07-18 22:07:56 +02:00
|
|
|
DBUG_ASSERT(!all);
|
2008-03-28 13:16:41 +01:00
|
|
|
/*
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
We reach this point if either only transactional tables were modified or
|
|
|
|
the effect of a statement that did not get into the binlog needs to be
|
|
|
|
rolled back. In the latter case, if a statement changed non-transactional
|
|
|
|
tables or had the OPTION_KEEP_LOG associated, we write an incident event
|
|
|
|
to the binlog in order to stop slaves and notify users that some changes
|
|
|
|
on the master did not get into the binlog and slaves will be inconsistent.
|
|
|
|
On the other hand, if a statement is transactional, we just safely roll it
|
|
|
|
back.
|
2009-07-18 22:07:56 +02:00
|
|
|
*/
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
if ((thd->transaction.stmt.modified_non_trans_table ||
|
|
|
|
(thd->options & OPTION_KEEP_LOG)) &&
|
|
|
|
mysql_bin_log.check_write_error(thd))
|
|
|
|
trx_data->set_incident();
|
2006-10-05 10:46:14 +02:00
|
|
|
error= binlog_end_trans(thd, trx_data, 0, all);
|
2008-03-28 13:16:41 +01:00
|
|
|
}
|
2009-07-18 22:07:56 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
We flush the cache with a rollback, wrapped in a beging/rollback if:
|
2009-10-06 02:38:58 +02:00
|
|
|
. aborting a transaction that modified a non-transactional table;
|
2009-07-18 22:07:56 +02:00
|
|
|
. aborting a statement that modified both transactional and
|
2009-10-06 02:38:58 +02:00
|
|
|
non-transactional tables but which is not in the boundaries of any
|
|
|
|
transaction or there was no early change;
|
2009-07-18 22:07:56 +02:00
|
|
|
. the OPTION_KEEP_LOG is activate.
|
|
|
|
*/
|
|
|
|
if ((all && thd->transaction.all.modified_non_trans_table) ||
|
|
|
|
(!all && thd->transaction.stmt.modified_non_trans_table &&
|
|
|
|
!(thd->options & (OPTION_BEGIN | OPTION_NOT_AUTOCOMMIT))) ||
|
2009-10-06 02:38:58 +02:00
|
|
|
(!all && thd->transaction.stmt.modified_non_trans_table &&
|
|
|
|
!trx_data->at_least_one_stmt_committed &&
|
|
|
|
thd->current_stmt_binlog_row_based) ||
|
2009-07-18 22:07:56 +02:00
|
|
|
((thd->options & OPTION_KEEP_LOG)))
|
|
|
|
{
|
|
|
|
Query_log_event qev(thd, STRING_WITH_LEN("ROLLBACK"), TRUE, TRUE, 0);
|
|
|
|
error= binlog_end_trans(thd, trx_data, &qev, all);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
Otherwise, we simply truncate the cache as there is no change on
|
|
|
|
non-transactional tables as follows.
|
|
|
|
*/
|
|
|
|
else if ((all && !thd->transaction.all.modified_non_trans_table) ||
|
|
|
|
(!all && !thd->transaction.stmt.modified_non_trans_table))
|
|
|
|
error= binlog_end_trans(thd, trx_data, 0, all);
|
|
|
|
}
|
2008-12-02 18:32:07 +01:00
|
|
|
if (!all)
|
|
|
|
trx_data->before_stmt_pos = MY_OFF_T_UNDEF; // part of the stmt rollback
|
2005-01-16 13:16:23 +01:00
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
void MYSQL_BIN_LOG::set_write_error(THD *thd)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::set_write_error");
|
|
|
|
|
|
|
|
write_error= 1;
|
|
|
|
|
|
|
|
if (check_write_error(thd))
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
|
|
|
|
if (my_errno == EFBIG)
|
|
|
|
my_message(ER_TRANS_CACHE_FULL, ER(ER_TRANS_CACHE_FULL), MYF(MY_WME));
|
|
|
|
else
|
|
|
|
my_error(ER_ERROR_ON_WRITE, MYF(MY_WME), name, errno);
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool MYSQL_BIN_LOG::check_write_error(THD *thd)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::check_write_error");
|
|
|
|
|
|
|
|
bool checked= FALSE;
|
|
|
|
|
|
|
|
if (!thd->is_error())
|
|
|
|
DBUG_RETURN(checked);
|
|
|
|
|
2009-09-10 11:18:29 +02:00
|
|
|
switch (thd->stmt_da->sql_errno())
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
{
|
|
|
|
case ER_TRANS_CACHE_FULL:
|
|
|
|
case ER_ERROR_ON_WRITE:
|
|
|
|
case ER_BINLOG_LOGGING_IMPOSSIBLE:
|
|
|
|
checked= TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(checked);
|
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
@note
|
|
|
|
How do we handle this (unlikely but legal) case:
|
|
|
|
@verbatim
|
|
|
|
[transaction] + [update to non-trans table] + [rollback to savepoint] ?
|
|
|
|
@endverbatim
|
2005-01-16 13:16:23 +01:00
|
|
|
The problem occurs when a savepoint is before the update to the
|
|
|
|
non-transactional table. Then when there's a rollback to the savepoint, if we
|
|
|
|
simply truncate the binlog cache, we lose the part of the binlog cache where
|
|
|
|
the update is. If we want to not lose it, we need to write the SAVEPOINT
|
|
|
|
command and the ROLLBACK TO SAVEPOINT command to the binlog cache. The latter
|
|
|
|
is easy: it's just write at the end of the binlog cache, but the former
|
|
|
|
should be *inserted* to the place where the user called SAVEPOINT. The
|
|
|
|
solution is that when the user calls SAVEPOINT, we write it to the binlog
|
|
|
|
cache (so no need to later insert it). As transactions are never intermixed
|
|
|
|
in the binary log (i.e. they are serialized), we won't have conflicts with
|
|
|
|
savepoint names when using mysqlbinlog or in the slave SQL thread.
|
|
|
|
Then when ROLLBACK TO SAVEPOINT is called, if we updated some
|
|
|
|
non-transactional table, we don't truncate the binlog cache but instead write
|
|
|
|
ROLLBACK TO SAVEPOINT to it; otherwise we truncate the binlog cache (which
|
|
|
|
will chop the SAVEPOINT command from the binlog cache, which is good as in
|
|
|
|
that case there is no need to have it in the binlog).
|
|
|
|
*/
|
|
|
|
|
2006-09-30 21:49:46 +02:00
|
|
|
static int binlog_savepoint_set(handlerton *hton, THD *thd, void *sv)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
DBUG_ENTER("binlog_savepoint_set");
|
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
binlog_trans_log_savepos(thd, (my_off_t*) sv);
|
2005-01-16 13:16:23 +01:00
|
|
|
/* Write it to the binary log */
|
2009-05-30 15:32:28 +02:00
|
|
|
|
|
|
|
int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED);
|
2005-12-24 12:07:07 +01:00
|
|
|
int const error=
|
|
|
|
thd->binlog_query(THD::STMT_QUERY_TYPE,
|
2009-10-16 12:29:42 +02:00
|
|
|
thd->query(), thd->query_length(), TRUE, FALSE, errcode);
|
2005-12-24 12:07:07 +01:00
|
|
|
DBUG_RETURN(error);
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
|
|
|
|
2006-09-30 21:49:46 +02:00
|
|
|
static int binlog_savepoint_rollback(handlerton *hton, THD *thd, void *sv)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
DBUG_ENTER("binlog_savepoint_rollback");
|
|
|
|
|
|
|
|
/*
|
|
|
|
Write ROLLBACK TO SAVEPOINT to the binlog cache if we have updated some
|
|
|
|
non-transactional table. Otherwise, truncate the binlog cache starting
|
|
|
|
from the SAVEPOINT command.
|
|
|
|
*/
|
2007-07-30 18:02:21 +02:00
|
|
|
if (unlikely(thd->transaction.all.modified_non_trans_table ||
|
|
|
|
(thd->options & OPTION_KEEP_LOG)))
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2009-05-30 15:32:28 +02:00
|
|
|
int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED);
|
2007-01-29 00:47:35 +01:00
|
|
|
int error=
|
2005-12-24 12:07:07 +01:00
|
|
|
thd->binlog_query(THD::STMT_QUERY_TYPE,
|
2009-10-16 12:29:42 +02:00
|
|
|
thd->query(), thd->query_length(), TRUE, FALSE, errcode);
|
2005-12-24 12:07:07 +01:00
|
|
|
DBUG_RETURN(error);
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
2006-10-05 10:46:14 +02:00
|
|
|
binlog_trans_log_truncate(thd, *(my_off_t*)sv);
|
2005-01-16 13:16:23 +01:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2007-01-29 00:47:35 +01:00
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
int check_binlog_magic(IO_CACHE* log, const char** errmsg)
|
|
|
|
{
|
|
|
|
char magic[4];
|
|
|
|
DBUG_ASSERT(my_b_tell(log) == 0);
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_read(log, (uchar*) magic, sizeof(magic)))
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
*errmsg = "I/O error reading the header from the binary log";
|
|
|
|
sql_print_error("%s, errno=%d, io cache code=%d", *errmsg, my_errno,
|
|
|
|
log->error);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (memcmp(magic, BINLOG_MAGIC, sizeof(magic)))
|
|
|
|
{
|
|
|
|
*errmsg = "Binlog has bad magic number; It's not a binary log file that can be used by this version of MySQL";
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-01-29 00:47:35 +01:00
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
File open_binlog(IO_CACHE *log, const char *log_file_name, const char **errmsg)
|
|
|
|
{
|
|
|
|
File file;
|
|
|
|
DBUG_ENTER("open_binlog");
|
|
|
|
|
2005-05-26 21:01:54 +02:00
|
|
|
if ((file = my_open(log_file_name, O_RDONLY | O_BINARY | O_SHARE,
|
|
|
|
MYF(MY_WME))) < 0)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
sql_print_error("Failed to open log (file '%s', errno %d)",
|
|
|
|
log_file_name, my_errno);
|
|
|
|
*errmsg = "Could not open log file";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (init_io_cache(log, file, IO_SIZE*2, READ_CACHE, 0, 0,
|
|
|
|
MYF(MY_WME|MY_DONT_CHECK_FILESIZE)))
|
|
|
|
{
|
|
|
|
sql_print_error("Failed to create a cache on log (file '%s')",
|
|
|
|
log_file_name);
|
|
|
|
*errmsg = "Could not open log file";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (check_binlog_magic(log,errmsg))
|
|
|
|
goto err;
|
|
|
|
DBUG_RETURN(file);
|
|
|
|
|
|
|
|
err:
|
|
|
|
if (file >= 0)
|
|
|
|
{
|
|
|
|
my_close(file,MYF(0));
|
|
|
|
end_io_cache(log);
|
|
|
|
}
|
|
|
|
DBUG_RETURN(-1);
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2009-09-30 22:10:22 +02:00
|
|
|
#ifdef _WIN32
|
2004-08-14 03:38:37 +02:00
|
|
|
static int eventSource = 0;
|
2004-08-26 18:22:22 +02:00
|
|
|
|
2007-03-28 18:37:27 +02:00
|
|
|
static void setup_windows_event_source()
|
2004-08-27 23:49:54 +02:00
|
|
|
{
|
2005-01-16 13:16:23 +01:00
|
|
|
HKEY hRegKey= NULL;
|
2004-08-27 23:49:54 +02:00
|
|
|
DWORD dwError= 0;
|
|
|
|
TCHAR szPath[MAX_PATH];
|
|
|
|
DWORD dwTypes;
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2004-08-27 23:49:54 +02:00
|
|
|
if (eventSource) // Ensure that we are only called once
|
|
|
|
return;
|
|
|
|
eventSource= 1;
|
2004-08-14 03:38:37 +02:00
|
|
|
|
2004-08-27 23:49:54 +02:00
|
|
|
// Create the event source registry key
|
2005-01-16 13:16:23 +01:00
|
|
|
dwError= RegCreateKey(HKEY_LOCAL_MACHINE,
|
2004-08-27 23:49:54 +02:00
|
|
|
"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\MySQL",
|
|
|
|
&hRegKey);
|
2004-08-14 03:38:37 +02:00
|
|
|
|
2004-08-27 23:49:54 +02:00
|
|
|
/* Name of the PE module that contains the message resource */
|
|
|
|
GetModuleFileName(NULL, szPath, MAX_PATH);
|
2004-08-26 18:22:22 +02:00
|
|
|
|
2004-08-30 00:50:39 +02:00
|
|
|
/* Register EventMessageFile */
|
2005-01-16 13:16:23 +01:00
|
|
|
dwError = RegSetValueEx(hRegKey, "EventMessageFile", 0, REG_EXPAND_SZ,
|
2007-02-27 18:31:49 +01:00
|
|
|
(PBYTE) szPath, (DWORD) (strlen(szPath) + 1));
|
2004-08-14 03:38:37 +02:00
|
|
|
|
2004-08-27 23:49:54 +02:00
|
|
|
/* Register supported event types */
|
|
|
|
dwTypes= (EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE |
|
|
|
|
EVENTLOG_INFORMATION_TYPE);
|
|
|
|
dwError= RegSetValueEx(hRegKey, "TypesSupported", 0, REG_DWORD,
|
|
|
|
(LPBYTE) &dwTypes, sizeof dwTypes);
|
2004-08-14 03:38:37 +02:00
|
|
|
|
2004-08-27 23:49:54 +02:00
|
|
|
RegCloseKey(hRegKey);
|
2004-08-14 03:38:37 +02:00
|
|
|
}
|
|
|
|
|
2009-09-30 22:10:22 +02:00
|
|
|
#endif /* _WIN32 */
|
2004-08-14 03:38:37 +02:00
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Find a unique filename for 'filename.#'.
|
|
|
|
|
2009-11-22 04:59:48 +01:00
|
|
|
Set '#' to the number next to the maximum found in the most
|
|
|
|
recent log file extension.
|
|
|
|
|
|
|
|
This function will return nonzero if: (i) the generated name
|
|
|
|
exceeds FN_REFLEN; (ii) if the number of extensions is exhausted;
|
|
|
|
or (iii) some other error happened while examining the filesystem.
|
2007-10-11 19:29:09 +02:00
|
|
|
|
|
|
|
@return
|
2009-11-22 04:59:48 +01:00
|
|
|
nonzero if not possible to get unique filename.
|
2007-10-11 19:29:09 +02:00
|
|
|
*/
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
static int find_uniq_filename(char *name)
|
|
|
|
{
|
2002-10-29 23:11:13 +01:00
|
|
|
uint i;
|
2009-11-22 04:59:48 +01:00
|
|
|
char buff[FN_REFLEN], ext_buf[FN_REFLEN];
|
2002-10-29 23:11:13 +01:00
|
|
|
struct st_my_dir *dir_info;
|
2000-07-31 21:29:14 +02:00
|
|
|
reg1 struct fileinfo *file_info;
|
2009-11-22 04:59:48 +01:00
|
|
|
ulong max_found= 0, next= 0, number= 0;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
size_t buf_length, length;
|
|
|
|
char *start, *end;
|
2009-11-22 04:59:48 +01:00
|
|
|
int error= 0;
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_ENTER("find_uniq_filename");
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
length= dirname_part(buff, name, &buf_length);
|
|
|
|
start= name + length;
|
|
|
|
end= strend(start);
|
2002-10-29 23:11:13 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
*end='.';
|
2009-11-22 04:59:48 +01:00
|
|
|
length= (size_t) (end - start + 1);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2009-11-22 04:59:48 +01:00
|
|
|
if (!(dir_info= my_dir(buff,MYF(MY_DONT_SORT))))
|
2000-07-31 21:29:14 +02:00
|
|
|
{ // This shouldn't happen
|
|
|
|
strmov(end,".1"); // use name+1
|
2009-11-22 04:59:48 +01:00
|
|
|
DBUG_RETURN(1);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
file_info= dir_info->dir_entry;
|
2009-11-22 04:59:48 +01:00
|
|
|
for (i= dir_info->number_off_files ; i-- ; file_info++)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (bcmp((uchar*) file_info->name, (uchar*) start, length) == 0 &&
|
2000-07-31 21:29:14 +02:00
|
|
|
test_if_number(file_info->name+length, &number,0))
|
|
|
|
{
|
|
|
|
set_if_bigger(max_found,(ulong) number);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
my_dirend(dir_info);
|
|
|
|
|
2009-11-22 04:59:48 +01:00
|
|
|
/* check if reached the maximum possible extension number */
|
|
|
|
if ((max_found == MAX_LOG_UNIQUE_FN_EXT))
|
|
|
|
{
|
|
|
|
sql_print_error("Log filename extension number exhausted: %06lu. \
|
|
|
|
Please fix this by archiving old logs and \
|
|
|
|
updating the index files.", max_found);
|
|
|
|
error= 1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
next= max_found + 1;
|
|
|
|
sprintf(ext_buf, "%06lu", next);
|
2000-07-31 21:29:14 +02:00
|
|
|
*end++='.';
|
2009-11-22 04:59:48 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Check if the generated extension size + the file name exceeds the
|
|
|
|
buffer size used. If one did not check this, then the filename might be
|
|
|
|
truncated, resulting in error.
|
|
|
|
*/
|
|
|
|
if (((strlen(ext_buf) + (end - name)) >= FN_REFLEN))
|
|
|
|
{
|
|
|
|
sql_print_error("Log filename too large: %s%s (%lu). \
|
|
|
|
Please fix this by archiving old logs and updating the \
|
|
|
|
index files.", name, ext_buf, (strlen(ext_buf) + (end - name)));
|
|
|
|
error= 1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
sprintf(end, "%06lu", next);
|
|
|
|
|
|
|
|
/* print warning if reaching the end of available extensions. */
|
|
|
|
if ((next > (MAX_LOG_UNIQUE_FN_EXT - LOG_WARN_UNIQUE_FN_EXT_LEFT)))
|
|
|
|
sql_print_warning("Next log extension: %lu. \
|
|
|
|
Remaining log filename extensions: %lu. \
|
|
|
|
Please consider archiving some logs.", next, (MAX_LOG_UNIQUE_FN_EXT - next));
|
|
|
|
|
|
|
|
end:
|
|
|
|
DBUG_RETURN(error);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
void MYSQL_LOG::init(enum_log_type log_type_arg,
|
2006-06-05 03:34:34 +02:00
|
|
|
enum cache_type io_cache_type_arg)
|
2006-05-05 08:45:58 +02:00
|
|
|
{
|
|
|
|
DBUG_ENTER("MYSQL_LOG::init");
|
|
|
|
log_type= log_type_arg;
|
|
|
|
io_cache_type= io_cache_type_arg;
|
|
|
|
DBUG_PRINT("info",("log_type: %d", log_type));
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-04 15:40:42 +01:00
|
|
|
bool MYSQL_LOG::init_and_set_log_file_name(const char *log_name,
|
|
|
|
const char *new_name,
|
|
|
|
enum_log_type log_type_arg,
|
|
|
|
enum cache_type io_cache_type_arg)
|
|
|
|
{
|
|
|
|
init(log_type_arg, io_cache_type_arg);
|
|
|
|
|
|
|
|
if (new_name && !strmov(log_file_name, new_name))
|
|
|
|
return TRUE;
|
|
|
|
else if (!new_name && generate_new_name(log_file_name, log_name))
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
/*
|
|
|
|
Open a (new) log file.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
open()
|
|
|
|
|
|
|
|
log_name The name of the log to open
|
|
|
|
log_type_arg The type of the log. E.g. LOG_NORMAL
|
|
|
|
new_name The new name for the logfile. This is only needed
|
|
|
|
when the method is used to open the binlog file.
|
|
|
|
io_cache_type_arg The type of the IO_CACHE to use for this log file
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
Open the logfile, init IO_CACHE and write startup messages
|
|
|
|
(in case of general and slow query logs).
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
0 ok
|
|
|
|
1 error
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool MYSQL_LOG::open(const char *log_name, enum_log_type log_type_arg,
|
|
|
|
const char *new_name, enum cache_type io_cache_type_arg)
|
|
|
|
{
|
|
|
|
char buff[FN_REFLEN];
|
|
|
|
File file= -1;
|
|
|
|
int open_flags= O_CREAT | O_BINARY;
|
|
|
|
DBUG_ENTER("MYSQL_LOG::open");
|
|
|
|
DBUG_PRINT("enter", ("log_type: %d", (int) log_type_arg));
|
|
|
|
|
|
|
|
write_error= 0;
|
|
|
|
|
|
|
|
if (!(name= my_strdup(log_name, MYF(MY_WME))))
|
|
|
|
{
|
|
|
|
name= (char *)log_name; // for the error message
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2009-12-04 15:40:42 +01:00
|
|
|
if (init_and_set_log_file_name(name, new_name,
|
|
|
|
log_type_arg, io_cache_type_arg))
|
2006-05-05 08:45:58 +02:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (io_cache_type == SEQ_READ_APPEND)
|
|
|
|
open_flags |= O_RDWR | O_APPEND;
|
|
|
|
else
|
|
|
|
open_flags |= O_WRONLY | (log_type == LOG_BIN ? 0 : O_APPEND);
|
|
|
|
|
|
|
|
db[0]= 0;
|
|
|
|
|
|
|
|
if ((file= my_open(log_file_name, open_flags,
|
|
|
|
MYF(MY_WME | ME_WAITTANG))) < 0 ||
|
|
|
|
init_io_cache(&log_file, file, IO_SIZE, io_cache_type,
|
|
|
|
my_tell(file, MYF(MY_WME)), 0,
|
|
|
|
MYF(MY_WME | MY_NABP |
|
|
|
|
((log_type == LOG_BIN) ? MY_WAIT_IF_FULL : 0))))
|
|
|
|
goto err;
|
|
|
|
|
2006-06-05 03:34:34 +02:00
|
|
|
if (log_type == LOG_NORMAL)
|
2006-05-05 08:45:58 +02:00
|
|
|
{
|
|
|
|
char *end;
|
2006-09-29 22:12:57 +02:00
|
|
|
int len=my_snprintf(buff, sizeof(buff), "%s, Version: %s (%s). "
|
2006-05-05 08:45:58 +02:00
|
|
|
#ifdef EMBEDDED_LIBRARY
|
2006-09-29 22:12:57 +02:00
|
|
|
"embedded library\n",
|
|
|
|
my_progname, server_version, MYSQL_COMPILATION_COMMENT
|
2009-09-30 22:10:22 +02:00
|
|
|
#elif _WIN32
|
2006-05-05 08:45:58 +02:00
|
|
|
"started with:\nTCP Port: %d, Named Pipe: %s\n",
|
2006-09-29 22:12:57 +02:00
|
|
|
my_progname, server_version, MYSQL_COMPILATION_COMMENT,
|
|
|
|
mysqld_port, mysqld_unix_port
|
2006-05-05 08:45:58 +02:00
|
|
|
#else
|
|
|
|
"started with:\nTcp port: %d Unix socket: %s\n",
|
2006-09-29 22:12:57 +02:00
|
|
|
my_progname, server_version, MYSQL_COMPILATION_COMMENT,
|
|
|
|
mysqld_port, mysqld_unix_port
|
2006-05-05 08:45:58 +02:00
|
|
|
#endif
|
|
|
|
);
|
|
|
|
end= strnmov(buff + len, "Time Id Command Argument\n",
|
|
|
|
sizeof(buff) - len);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) buff, (uint) (end-buff)) ||
|
2006-05-05 08:45:58 +02:00
|
|
|
flush_io_cache(&log_file))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2006-06-05 03:34:34 +02:00
|
|
|
log_state= LOG_OPENED;
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
|
|
|
err:
|
|
|
|
sql_print_error("Could not use %s for logging (error %d). \
|
|
|
|
Turning logging off for the whole duration of the MySQL server process. \
|
|
|
|
To turn it on again: fix the cause, \
|
|
|
|
shutdown the MySQL server and restart it.", name, errno);
|
|
|
|
if (file >= 0)
|
|
|
|
my_close(file, MYF(0));
|
|
|
|
end_io_cache(&log_file);
|
|
|
|
safeFree(name);
|
2006-06-05 03:34:34 +02:00
|
|
|
log_state= LOG_CLOSED;
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
2002-06-05 22:04:38 +02:00
|
|
|
MYSQL_LOG::MYSQL_LOG()
|
2007-04-13 19:23:02 +02:00
|
|
|
: name(0), write_error(FALSE), inited(FALSE), log_type(LOG_UNKNOWN),
|
|
|
|
log_state(LOG_CLOSED)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
/*
|
2003-07-11 14:26:44 +02:00
|
|
|
We don't want to initialize LOCK_Log here as such initialization depends on
|
|
|
|
safe_mutex (when using safe_mutex) which depends on MY_INIT(), which is
|
2003-07-14 09:12:05 +02:00
|
|
|
called only in main(). Doing initialization here would make it happen
|
2005-01-16 13:16:23 +01:00
|
|
|
before main().
|
2000-07-31 21:29:14 +02:00
|
|
|
*/
|
2006-05-05 08:45:58 +02:00
|
|
|
bzero((char*) &log_file, sizeof(log_file));
|
|
|
|
}
|
|
|
|
|
|
|
|
void MYSQL_LOG::init_pthread_objects()
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(inited == 0);
|
|
|
|
inited= 1;
|
|
|
|
(void) pthread_mutex_init(&LOCK_log, MY_MUTEX_INIT_SLOW);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Close the log file
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
close()
|
|
|
|
exiting Bitmask. For the slow and general logs the only used bit is
|
|
|
|
LOG_CLOSE_TO_BE_OPENED. This is used if we intend to call
|
|
|
|
open at once after close.
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
One can do an open on the object at once after doing a close.
|
|
|
|
The internal structures are not freed until cleanup() is called
|
|
|
|
*/
|
|
|
|
|
|
|
|
void MYSQL_LOG::close(uint exiting)
|
|
|
|
{ // One can't set log_type here!
|
|
|
|
DBUG_ENTER("MYSQL_LOG::close");
|
|
|
|
DBUG_PRINT("enter",("exiting: %d", (int) exiting));
|
2006-06-05 03:34:34 +02:00
|
|
|
if (log_state == LOG_OPENED)
|
2006-05-05 08:45:58 +02:00
|
|
|
{
|
|
|
|
end_io_cache(&log_file);
|
|
|
|
|
|
|
|
if (my_sync(log_file.file, MYF(MY_WME)) && ! write_error)
|
|
|
|
{
|
|
|
|
write_error= 1;
|
|
|
|
sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (my_close(log_file.file, MYF(MY_WME)) && ! write_error)
|
|
|
|
{
|
|
|
|
write_error= 1;
|
|
|
|
sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-05 03:34:34 +02:00
|
|
|
log_state= (exiting & LOG_CLOSE_TO_BE_OPENED) ? LOG_TO_BE_OPENED : LOG_CLOSED;
|
2006-05-05 08:45:58 +02:00
|
|
|
safeFree(name);
|
|
|
|
DBUG_VOID_RETURN;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/** This is called only once. */
|
2003-07-11 14:26:44 +02:00
|
|
|
|
2003-01-28 07:38:28 +01:00
|
|
|
void MYSQL_LOG::cleanup()
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2004-04-09 06:12:41 +02:00
|
|
|
DBUG_ENTER("cleanup");
|
2000-07-31 21:29:14 +02:00
|
|
|
if (inited)
|
2000-11-13 22:55:10 +01:00
|
|
|
{
|
2003-01-28 07:38:28 +01:00
|
|
|
inited= 0;
|
2000-11-13 22:55:10 +01:00
|
|
|
(void) pthread_mutex_destroy(&LOCK_log);
|
2006-05-05 08:45:58 +02:00
|
|
|
close(0);
|
2000-11-13 22:55:10 +01:00
|
|
|
}
|
2004-04-09 06:12:41 +02:00
|
|
|
DBUG_VOID_RETURN;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2000-11-15 22:00:06 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
int MYSQL_LOG::generate_new_name(char *new_name, const char *log_name)
|
2005-02-01 15:36:48 +01:00
|
|
|
{
|
2006-06-05 03:34:34 +02:00
|
|
|
fn_format(new_name, log_name, mysql_data_home, "", 4);
|
|
|
|
if (log_type == LOG_BIN)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
if (!fn_ext(log_name)[0])
|
|
|
|
{
|
|
|
|
if (find_uniq_filename(new_name))
|
|
|
|
{
|
2009-11-22 04:59:48 +01:00
|
|
|
/*
|
|
|
|
This should be treated as error once propagation of error further
|
|
|
|
up in the stack gets proper handling.
|
|
|
|
*/
|
|
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
ER_NO_UNIQUE_LOGFILE, ER(ER_NO_UNIQUE_LOGFILE),
|
|
|
|
log_name);
|
2000-07-31 21:29:14 +02:00
|
|
|
sql_print_error(ER(ER_NO_UNIQUE_LOGFILE), log_name);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-04-25 01:39:26 +02:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
/*
|
|
|
|
Reopen the log file
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
reopen_file()
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
Reopen the log file. The method is used during FLUSH LOGS
|
|
|
|
and locks LOCK_log mutex
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2006-06-05 03:34:34 +02:00
|
|
|
void MYSQL_QUERY_LOG::reopen_file()
|
2001-04-25 01:39:26 +02:00
|
|
|
{
|
2006-05-05 08:45:58 +02:00
|
|
|
char *save_name;
|
|
|
|
|
|
|
|
DBUG_ENTER("MYSQL_LOG::reopen_file");
|
|
|
|
if (!is_open())
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info",("log is closed"));
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
pthread_mutex_lock(&LOCK_log);
|
|
|
|
|
|
|
|
save_name= name;
|
|
|
|
name= 0; // Don't free name
|
|
|
|
close(LOG_CLOSE_TO_BE_OPENED);
|
|
|
|
|
|
|
|
/*
|
2006-06-05 03:34:34 +02:00
|
|
|
Note that at this point, log_state != LOG_CLOSED (important for is_open()).
|
2006-05-05 08:45:58 +02:00
|
|
|
*/
|
|
|
|
|
2006-06-05 03:34:34 +02:00
|
|
|
open(save_name, log_type, 0, io_cache_type);
|
2006-05-05 08:45:58 +02:00
|
|
|
my_free(save_name, MYF(0));
|
|
|
|
|
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
|
|
|
|
2003-07-06 17:59:54 +02:00
|
|
|
DBUG_VOID_RETURN;
|
2001-04-25 01:39:26 +02:00
|
|
|
}
|
|
|
|
|
2003-07-14 09:12:05 +02:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
/*
|
|
|
|
Write a command to traditional general log file
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
write()
|
|
|
|
|
|
|
|
event_time command start timestamp
|
|
|
|
user_host the pointer to the string with user@host info
|
|
|
|
user_host_len length of the user_host string. this is computed once
|
|
|
|
and passed to all general log event handlers
|
|
|
|
thread_id Id of the thread, issued a query
|
|
|
|
command_type the type of the command being logged
|
|
|
|
command_type_len the length of the string above
|
|
|
|
sql_text the very text of the query being executed
|
|
|
|
sql_text_len the length of sql_text string
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
Log given command to to normal (not rotable) log file
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
FASE - OK
|
|
|
|
TRUE - error occured
|
|
|
|
*/
|
|
|
|
|
2006-06-05 03:34:34 +02:00
|
|
|
bool MYSQL_QUERY_LOG::write(time_t event_time, const char *user_host,
|
|
|
|
uint user_host_len, int thread_id,
|
|
|
|
const char *command_type, uint command_type_len,
|
|
|
|
const char *sql_text, uint sql_text_len)
|
2003-07-11 14:26:44 +02:00
|
|
|
{
|
2006-05-05 08:45:58 +02:00
|
|
|
char buff[32];
|
|
|
|
uint length= 0;
|
2007-08-13 15:11:25 +02:00
|
|
|
char local_time_buff[MAX_TIME_SIZE];
|
2006-05-05 08:45:58 +02:00
|
|
|
struct tm start;
|
|
|
|
uint time_buff_len= 0;
|
|
|
|
|
2007-07-27 20:19:36 +02:00
|
|
|
(void) pthread_mutex_lock(&LOCK_log);
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
/* Test if someone closed between the is_open test and lock */
|
|
|
|
if (is_open())
|
|
|
|
{
|
2009-06-12 16:28:10 +02:00
|
|
|
/* for testing output of timestamp and thread id */
|
|
|
|
DBUG_EXECUTE_IF("reset_log_last_time", last_time= 0;);
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
/* Note that my_b_write() assumes it knows the length for this */
|
|
|
|
if (event_time != last_time)
|
|
|
|
{
|
|
|
|
last_time= event_time;
|
|
|
|
|
|
|
|
localtime_r(&event_time, &start);
|
|
|
|
|
2007-08-13 15:11:25 +02:00
|
|
|
time_buff_len= my_snprintf(local_time_buff, MAX_TIME_SIZE,
|
2009-06-12 16:28:10 +02:00
|
|
|
"%02d%02d%02d %2d:%02d:%02d\t",
|
2006-05-05 08:45:58 +02:00
|
|
|
start.tm_year % 100, start.tm_mon + 1,
|
|
|
|
start.tm_mday, start.tm_hour,
|
|
|
|
start.tm_min, start.tm_sec);
|
|
|
|
|
2007-08-13 15:11:25 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) local_time_buff, time_buff_len))
|
2006-05-05 08:45:58 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
else
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) "\t\t" ,2) < 0)
|
2006-05-05 08:45:58 +02:00
|
|
|
goto err;
|
|
|
|
|
2006-12-21 19:36:28 +01:00
|
|
|
/* command_type, thread_id */
|
2006-11-01 18:41:09 +01:00
|
|
|
length= my_snprintf(buff, 32, "%5ld ", (long) thread_id);
|
2006-05-05 08:45:58 +02:00
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) buff, length))
|
2006-05-05 08:45:58 +02:00
|
|
|
goto err;
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) command_type, command_type_len))
|
2006-05-05 08:45:58 +02:00
|
|
|
goto err;
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) "\t", 1))
|
2006-05-05 08:45:58 +02:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* sql_text */
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) sql_text, sql_text_len))
|
2006-05-05 08:45:58 +02:00
|
|
|
goto err;
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) "\n", 1) ||
|
2006-05-05 08:45:58 +02:00
|
|
|
flush_io_cache(&log_file))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2007-07-27 20:19:36 +02:00
|
|
|
(void) pthread_mutex_unlock(&LOCK_log);
|
2006-05-05 08:45:58 +02:00
|
|
|
return FALSE;
|
|
|
|
err:
|
|
|
|
|
|
|
|
if (!write_error)
|
|
|
|
{
|
|
|
|
write_error= 1;
|
|
|
|
sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno);
|
|
|
|
}
|
2007-07-27 20:19:36 +02:00
|
|
|
(void) pthread_mutex_unlock(&LOCK_log);
|
2006-05-05 08:45:58 +02:00
|
|
|
return TRUE;
|
2001-04-25 01:39:26 +02:00
|
|
|
}
|
|
|
|
|
2003-07-14 09:12:05 +02:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
/*
|
|
|
|
Log a query to the traditional slow log file
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
write()
|
|
|
|
|
|
|
|
thd THD of the query
|
|
|
|
current_time current timestamp
|
|
|
|
query_start_arg command start timestamp
|
|
|
|
user_host the pointer to the string with user@host info
|
|
|
|
user_host_len length of the user_host string. this is computed once
|
|
|
|
and passed to all general log event handlers
|
2007-07-30 10:33:50 +02:00
|
|
|
query_utime Amount of time the query took to execute (in microseconds)
|
|
|
|
lock_utime Amount of time the query was locked (in microseconds)
|
2006-05-05 08:45:58 +02:00
|
|
|
is_command The flag, which determines, whether the sql_text is a
|
|
|
|
query or an administrator command.
|
|
|
|
sql_text the very text of the query or administrator command
|
|
|
|
processed
|
|
|
|
sql_text_len the length of sql_text string
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
Log a query to the slow log file.
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
FALSE - OK
|
|
|
|
TRUE - error occured
|
|
|
|
*/
|
|
|
|
|
2006-06-05 03:34:34 +02:00
|
|
|
bool MYSQL_QUERY_LOG::write(THD *thd, time_t current_time,
|
|
|
|
time_t query_start_arg, const char *user_host,
|
2007-07-30 10:33:50 +02:00
|
|
|
uint user_host_len, ulonglong query_utime,
|
|
|
|
ulonglong lock_utime, bool is_command,
|
2006-06-05 03:34:34 +02:00
|
|
|
const char *sql_text, uint sql_text_len)
|
2003-07-11 14:26:44 +02:00
|
|
|
{
|
2006-05-05 08:45:58 +02:00
|
|
|
bool error= 0;
|
2006-06-05 03:34:34 +02:00
|
|
|
DBUG_ENTER("MYSQL_QUERY_LOG::write");
|
2006-05-05 08:45:58 +02:00
|
|
|
|
2007-07-27 20:19:36 +02:00
|
|
|
(void) pthread_mutex_lock(&LOCK_log);
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
if (!is_open())
|
2007-07-27 20:19:36 +02:00
|
|
|
{
|
|
|
|
(void) pthread_mutex_unlock(&LOCK_log);
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_RETURN(0);
|
2007-07-27 20:19:36 +02:00
|
|
|
}
|
2006-05-05 08:45:58 +02:00
|
|
|
|
|
|
|
if (is_open())
|
|
|
|
{ // Safety agains reopen
|
|
|
|
int tmp_errno= 0;
|
|
|
|
char buff[80], *end;
|
2007-07-30 10:33:50 +02:00
|
|
|
char query_time_buff[22+7], lock_time_buff[22+7];
|
2006-05-05 08:45:58 +02:00
|
|
|
uint buff_len;
|
|
|
|
end= buff;
|
|
|
|
|
|
|
|
if (!(specialflag & SPECIAL_SHORT_LOG_FORMAT))
|
|
|
|
{
|
|
|
|
if (current_time != last_time)
|
|
|
|
{
|
|
|
|
last_time= current_time;
|
|
|
|
struct tm start;
|
|
|
|
localtime_r(¤t_time, &start);
|
|
|
|
|
|
|
|
buff_len= my_snprintf(buff, sizeof buff,
|
|
|
|
"# Time: %02d%02d%02d %2d:%02d:%02d\n",
|
|
|
|
start.tm_year % 100, start.tm_mon + 1,
|
|
|
|
start.tm_mday, start.tm_hour,
|
|
|
|
start.tm_min, start.tm_sec);
|
|
|
|
|
|
|
|
/* Note that my_b_write() assumes it knows the length for this */
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) buff, buff_len))
|
2006-05-05 08:45:58 +02:00
|
|
|
tmp_errno= errno;
|
|
|
|
}
|
2007-10-18 20:45:07 +02:00
|
|
|
const uchar uh[]= "# User@Host: ";
|
|
|
|
if (my_b_write(&log_file, uh, sizeof(uh) - 1))
|
2006-05-05 08:45:58 +02:00
|
|
|
tmp_errno= errno;
|
2007-10-18 20:45:07 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) user_host, user_host_len))
|
2006-05-05 08:45:58 +02:00
|
|
|
tmp_errno= errno;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) "\n", 1))
|
2006-05-05 08:45:58 +02:00
|
|
|
tmp_errno= errno;
|
|
|
|
}
|
|
|
|
/* For slow query log */
|
2007-07-30 10:33:50 +02:00
|
|
|
sprintf(query_time_buff, "%.6f", ulonglong2double(query_utime)/1000000.0);
|
|
|
|
sprintf(lock_time_buff, "%.6f", ulonglong2double(lock_utime)/1000000.0);
|
2006-05-05 08:45:58 +02:00
|
|
|
if (my_b_printf(&log_file,
|
2007-07-30 10:33:50 +02:00
|
|
|
"# Query_time: %s Lock_time: %s"
|
2006-05-05 08:45:58 +02:00
|
|
|
" Rows_sent: %lu Rows_examined: %lu\n",
|
2007-07-30 10:33:50 +02:00
|
|
|
query_time_buff, lock_time_buff,
|
2006-05-05 08:45:58 +02:00
|
|
|
(ulong) thd->sent_row_count,
|
|
|
|
(ulong) thd->examined_row_count) == (uint) -1)
|
|
|
|
tmp_errno= errno;
|
|
|
|
if (thd->db && strcmp(thd->db, db))
|
|
|
|
{ // Database changed
|
|
|
|
if (my_b_printf(&log_file,"use %s;\n",thd->db) == (uint) -1)
|
|
|
|
tmp_errno= errno;
|
|
|
|
strmov(db,thd->db);
|
|
|
|
}
|
WL#3146 "less locking in auto_increment":
this is a cleanup patch for our current auto_increment handling:
new names for auto_increment variables in THD, new methods to manipulate them
(see sql_class.h), some move into handler::, causing less backup/restore
work when executing substatements.
This makes the logic hopefully clearer, less work is is needed in
mysql_insert().
By cleaning up, using different variables for different purposes (instead
of one for 3 things...), we fix those bugs, which someone may want to fix
in 5.0 too:
BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
statement-based"
BUG#20341 "stored function inserting into one auto_increment puts bad
data in slave"
BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
(now if a row is updated, LAST_INSERT_ID() will return its id)
and re-fixes:
BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
(already fixed differently by Ramil in 4.1)
Test of documented behaviour of mysql_insert_id() (there was no test).
The behaviour changes introduced are:
- LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
successfully inserted", instead of "the first autogenerated auto_increment
value if any row was successfully inserted", see auto_increment.test.
Same for mysql_insert_id(), see mysql_client_test.c.
- LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
mysql_client_test.c.
- LAST_INSERT_ID() does not change if no autogenerated value was successfully
inserted (it used to then be 0), see auto_increment.test.
- if in INSERT SELECT no autogenerated value was successfully inserted,
mysql_insert_id() now returns the id of the last inserted row (it already
did this for INSERT VALUES), see mysql_client_test.c.
- if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
(it already did this for INSERT VALUES), see mysql_client_test.c.
- NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
influences not only the first row now.
Additionally, when unlocking a table we check that the thread is not keeping
a next_insert_id (as the table is unlocked that id is potentially out-of-date);
forgetting about this next_insert_id is done in a new
handler::ha_release_auto_increment().
Finally we prepare for engines capable of reserving finite-length intervals
of auto_increment values: we store such intervals in THD. The next step
(to be done by the replication team in 5.1) is to read those intervals from
THD and actually store them in the statement-based binary log. NDB
will be a good engine to test that.
2006-07-09 17:52:19 +02:00
|
|
|
if (thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt)
|
2006-05-05 08:45:58 +02:00
|
|
|
{
|
|
|
|
end=strmov(end, ",last_insert_id=");
|
WL#3146 "less locking in auto_increment":
this is a cleanup patch for our current auto_increment handling:
new names for auto_increment variables in THD, new methods to manipulate them
(see sql_class.h), some move into handler::, causing less backup/restore
work when executing substatements.
This makes the logic hopefully clearer, less work is is needed in
mysql_insert().
By cleaning up, using different variables for different purposes (instead
of one for 3 things...), we fix those bugs, which someone may want to fix
in 5.0 too:
BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
statement-based"
BUG#20341 "stored function inserting into one auto_increment puts bad
data in slave"
BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
(now if a row is updated, LAST_INSERT_ID() will return its id)
and re-fixes:
BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
(already fixed differently by Ramil in 4.1)
Test of documented behaviour of mysql_insert_id() (there was no test).
The behaviour changes introduced are:
- LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
successfully inserted", instead of "the first autogenerated auto_increment
value if any row was successfully inserted", see auto_increment.test.
Same for mysql_insert_id(), see mysql_client_test.c.
- LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
mysql_client_test.c.
- LAST_INSERT_ID() does not change if no autogenerated value was successfully
inserted (it used to then be 0), see auto_increment.test.
- if in INSERT SELECT no autogenerated value was successfully inserted,
mysql_insert_id() now returns the id of the last inserted row (it already
did this for INSERT VALUES), see mysql_client_test.c.
- if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
(it already did this for INSERT VALUES), see mysql_client_test.c.
- NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
influences not only the first row now.
Additionally, when unlocking a table we check that the thread is not keeping
a next_insert_id (as the table is unlocked that id is potentially out-of-date);
forgetting about this next_insert_id is done in a new
handler::ha_release_auto_increment().
Finally we prepare for engines capable of reserving finite-length intervals
of auto_increment values: we store such intervals in THD. The next step
(to be done by the replication team in 5.1) is to read those intervals from
THD and actually store them in the statement-based binary log. NDB
will be a good engine to test that.
2006-07-09 17:52:19 +02:00
|
|
|
end=longlong10_to_str((longlong)
|
|
|
|
thd->first_successful_insert_id_in_prev_stmt_for_binlog,
|
|
|
|
end, -10);
|
2006-05-05 08:45:58 +02:00
|
|
|
}
|
|
|
|
// Save value if we do an insert.
|
WL#3146 "less locking in auto_increment":
this is a cleanup patch for our current auto_increment handling:
new names for auto_increment variables in THD, new methods to manipulate them
(see sql_class.h), some move into handler::, causing less backup/restore
work when executing substatements.
This makes the logic hopefully clearer, less work is is needed in
mysql_insert().
By cleaning up, using different variables for different purposes (instead
of one for 3 things...), we fix those bugs, which someone may want to fix
in 5.0 too:
BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
statement-based"
BUG#20341 "stored function inserting into one auto_increment puts bad
data in slave"
BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
(now if a row is updated, LAST_INSERT_ID() will return its id)
and re-fixes:
BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
(already fixed differently by Ramil in 4.1)
Test of documented behaviour of mysql_insert_id() (there was no test).
The behaviour changes introduced are:
- LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
successfully inserted", instead of "the first autogenerated auto_increment
value if any row was successfully inserted", see auto_increment.test.
Same for mysql_insert_id(), see mysql_client_test.c.
- LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
mysql_client_test.c.
- LAST_INSERT_ID() does not change if no autogenerated value was successfully
inserted (it used to then be 0), see auto_increment.test.
- if in INSERT SELECT no autogenerated value was successfully inserted,
mysql_insert_id() now returns the id of the last inserted row (it already
did this for INSERT VALUES), see mysql_client_test.c.
- if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
(it already did this for INSERT VALUES), see mysql_client_test.c.
- NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
influences not only the first row now.
Additionally, when unlocking a table we check that the thread is not keeping
a next_insert_id (as the table is unlocked that id is potentially out-of-date);
forgetting about this next_insert_id is done in a new
handler::ha_release_auto_increment().
Finally we prepare for engines capable of reserving finite-length intervals
of auto_increment values: we store such intervals in THD. The next step
(to be done by the replication team in 5.1) is to read those intervals from
THD and actually store them in the statement-based binary log. NDB
will be a good engine to test that.
2006-07-09 17:52:19 +02:00
|
|
|
if (thd->auto_inc_intervals_in_cur_stmt_for_binlog.nb_elements() > 0)
|
2006-05-05 08:45:58 +02:00
|
|
|
{
|
|
|
|
if (!(specialflag & SPECIAL_SHORT_LOG_FORMAT))
|
|
|
|
{
|
|
|
|
end=strmov(end,",insert_id=");
|
WL#3146 "less locking in auto_increment":
this is a cleanup patch for our current auto_increment handling:
new names for auto_increment variables in THD, new methods to manipulate them
(see sql_class.h), some move into handler::, causing less backup/restore
work when executing substatements.
This makes the logic hopefully clearer, less work is is needed in
mysql_insert().
By cleaning up, using different variables for different purposes (instead
of one for 3 things...), we fix those bugs, which someone may want to fix
in 5.0 too:
BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
statement-based"
BUG#20341 "stored function inserting into one auto_increment puts bad
data in slave"
BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
(now if a row is updated, LAST_INSERT_ID() will return its id)
and re-fixes:
BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
(already fixed differently by Ramil in 4.1)
Test of documented behaviour of mysql_insert_id() (there was no test).
The behaviour changes introduced are:
- LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
successfully inserted", instead of "the first autogenerated auto_increment
value if any row was successfully inserted", see auto_increment.test.
Same for mysql_insert_id(), see mysql_client_test.c.
- LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
mysql_client_test.c.
- LAST_INSERT_ID() does not change if no autogenerated value was successfully
inserted (it used to then be 0), see auto_increment.test.
- if in INSERT SELECT no autogenerated value was successfully inserted,
mysql_insert_id() now returns the id of the last inserted row (it already
did this for INSERT VALUES), see mysql_client_test.c.
- if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
(it already did this for INSERT VALUES), see mysql_client_test.c.
- NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
influences not only the first row now.
Additionally, when unlocking a table we check that the thread is not keeping
a next_insert_id (as the table is unlocked that id is potentially out-of-date);
forgetting about this next_insert_id is done in a new
handler::ha_release_auto_increment().
Finally we prepare for engines capable of reserving finite-length intervals
of auto_increment values: we store such intervals in THD. The next step
(to be done by the replication team in 5.1) is to read those intervals from
THD and actually store them in the statement-based binary log. NDB
will be a good engine to test that.
2006-07-09 17:52:19 +02:00
|
|
|
end=longlong10_to_str((longlong)
|
|
|
|
thd->auto_inc_intervals_in_cur_stmt_for_binlog.minimum(),
|
|
|
|
end, -10);
|
2006-05-05 08:45:58 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
This info used to show up randomly, depending on whether the query
|
|
|
|
checked the query start time or not. now we always write current
|
|
|
|
timestamp to the slow log
|
|
|
|
*/
|
|
|
|
end= strmov(end, ",timestamp=");
|
|
|
|
end= int10_to_str((long) current_time, end, 10);
|
|
|
|
|
|
|
|
if (end != buff)
|
|
|
|
{
|
|
|
|
*end++=';';
|
|
|
|
*end='\n';
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) "SET ", 4) ||
|
|
|
|
my_b_write(&log_file, (uchar*) buff + 1, (uint) (end-buff)))
|
2006-05-05 08:45:58 +02:00
|
|
|
tmp_errno= errno;
|
|
|
|
}
|
|
|
|
if (is_command)
|
|
|
|
{
|
|
|
|
end= strxmov(buff, "# administrator command: ", NullS);
|
|
|
|
buff_len= (ulong) (end - buff);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_b_write(&log_file, (uchar*) buff, buff_len);
|
2006-05-05 08:45:58 +02:00
|
|
|
}
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_write(&log_file, (uchar*) sql_text, sql_text_len) ||
|
|
|
|
my_b_write(&log_file, (uchar*) ";\n",2) ||
|
2006-05-05 08:45:58 +02:00
|
|
|
flush_io_cache(&log_file))
|
|
|
|
tmp_errno= errno;
|
|
|
|
if (tmp_errno)
|
|
|
|
{
|
|
|
|
error= 1;
|
|
|
|
if (! write_error)
|
|
|
|
{
|
|
|
|
write_error= 1;
|
|
|
|
sql_print_error(ER(ER_ERROR_ON_WRITE), name, error);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-07-27 20:19:36 +02:00
|
|
|
(void) pthread_mutex_unlock(&LOCK_log);
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_RETURN(error);
|
2001-04-25 01:39:26 +02:00
|
|
|
}
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
@todo
|
|
|
|
The following should be using fn_format(); We just need to
|
|
|
|
first change fn_format() to cut the file name if it's too long.
|
|
|
|
*/
|
2005-02-01 15:36:48 +01:00
|
|
|
const char *MYSQL_LOG::generate_name(const char *log_name,
|
2006-05-05 08:45:58 +02:00
|
|
|
const char *suffix,
|
|
|
|
bool strip_ext, char *buff)
|
2005-02-01 15:36:48 +01:00
|
|
|
{
|
|
|
|
if (!log_name || !log_name[0])
|
|
|
|
{
|
2007-11-06 19:41:06 +01:00
|
|
|
strmake(buff, pidfile_name, FN_REFLEN - strlen(suffix) - 1);
|
|
|
|
return (const char *)
|
|
|
|
fn_format(buff, buff, "", suffix, MYF(MY_REPLACE_EXT|MY_REPLACE_DIR));
|
2005-02-01 15:36:48 +01:00
|
|
|
}
|
|
|
|
// get rid of extension if the log is binary to avoid problems
|
|
|
|
if (strip_ext)
|
|
|
|
{
|
2006-05-05 08:45:58 +02:00
|
|
|
char *p= fn_ext(log_name);
|
|
|
|
uint length= (uint) (p - log_name);
|
|
|
|
strmake(buff, log_name, min(length, FN_REFLEN));
|
2005-02-01 15:36:48 +01:00
|
|
|
return (const char*)buff;
|
|
|
|
}
|
|
|
|
return log_name;
|
|
|
|
}
|
|
|
|
|
2006-05-03 18:40:52 +02:00
|
|
|
|
2006-06-07 21:58:08 +02:00
|
|
|
|
2009-09-29 16:27:12 +02:00
|
|
|
MYSQL_BIN_LOG::MYSQL_BIN_LOG(uint *sync_period)
|
2006-05-05 08:45:58 +02:00
|
|
|
:bytes_written(0), prepared_xids(0), file_id(1), open_count(1),
|
|
|
|
need_start_event(TRUE), m_table_map_version(0),
|
2009-09-29 16:27:12 +02:00
|
|
|
sync_period_ptr(sync_period),
|
2009-09-29 13:16:23 +02:00
|
|
|
is_relay_log(0), signal_cnt(0),
|
2006-05-05 08:45:58 +02:00
|
|
|
description_event_for_exec(0), description_event_for_queue(0)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
We don't want to initialize locks here as such initialization depends on
|
|
|
|
safe_mutex (when using safe_mutex) which depends on MY_INIT(), which is
|
|
|
|
called only in main(). Doing initialization here would make it happen
|
|
|
|
before main().
|
|
|
|
*/
|
|
|
|
index_file_name[0] = 0;
|
|
|
|
bzero((char*) &index_file, sizeof(index_file));
|
2009-12-04 15:40:42 +01:00
|
|
|
bzero((char*) &purge_index_file, sizeof(purge_index_file));
|
2006-05-05 08:45:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* this is called only once */
|
|
|
|
|
|
|
|
void MYSQL_BIN_LOG::cleanup()
|
|
|
|
{
|
|
|
|
DBUG_ENTER("cleanup");
|
|
|
|
if (inited)
|
|
|
|
{
|
|
|
|
inited= 0;
|
|
|
|
close(LOG_CLOSE_INDEX|LOG_CLOSE_STOP_EVENT);
|
|
|
|
delete description_event_for_queue;
|
|
|
|
delete description_event_for_exec;
|
|
|
|
(void) pthread_mutex_destroy(&LOCK_log);
|
|
|
|
(void) pthread_mutex_destroy(&LOCK_index);
|
|
|
|
(void) pthread_cond_destroy(&update_cond);
|
|
|
|
}
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Init binlog-specific vars */
|
|
|
|
void MYSQL_BIN_LOG::init(bool no_auto_events_arg, ulong max_size_arg)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::init");
|
|
|
|
no_auto_events= no_auto_events_arg;
|
|
|
|
max_size= max_size_arg;
|
|
|
|
DBUG_PRINT("info",("max_size: %lu", max_size));
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MYSQL_BIN_LOG::init_pthread_objects()
|
|
|
|
{
|
|
|
|
DBUG_ASSERT(inited == 0);
|
|
|
|
inited= 1;
|
|
|
|
(void) pthread_mutex_init(&LOCK_log, MY_MUTEX_INIT_SLOW);
|
|
|
|
(void) pthread_mutex_init(&LOCK_index, MY_MUTEX_INIT_SLOW);
|
|
|
|
(void) pthread_cond_init(&update_cond, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool MYSQL_BIN_LOG::open_index_file(const char *index_file_name_arg,
|
2009-12-04 15:40:42 +01:00
|
|
|
const char *log_name, bool need_mutex)
|
2005-02-01 15:36:48 +01:00
|
|
|
{
|
|
|
|
File index_file_nr= -1;
|
|
|
|
DBUG_ASSERT(!my_b_inited(&index_file));
|
|
|
|
|
|
|
|
/*
|
|
|
|
First open of this class instance
|
|
|
|
Create an index file that will hold all file names uses for logging.
|
|
|
|
Add new entries to the end of it.
|
|
|
|
*/
|
|
|
|
myf opt= MY_UNPACK_FILENAME;
|
|
|
|
if (!index_file_name_arg)
|
|
|
|
{
|
|
|
|
index_file_name_arg= log_name; // Use same basename for index file
|
|
|
|
opt= MY_UNPACK_FILENAME | MY_REPLACE_EXT;
|
|
|
|
}
|
|
|
|
fn_format(index_file_name, index_file_name_arg, mysql_data_home,
|
|
|
|
".index", opt);
|
|
|
|
if ((index_file_nr= my_open(index_file_name,
|
|
|
|
O_RDWR | O_CREAT | O_BINARY ,
|
|
|
|
MYF(MY_WME))) < 0 ||
|
|
|
|
my_sync(index_file_nr, MYF(MY_WME)) ||
|
|
|
|
init_io_cache(&index_file, index_file_nr,
|
|
|
|
IO_SIZE, WRITE_CACHE,
|
|
|
|
my_seek(index_file_nr,0L,MY_SEEK_END,MYF(0)),
|
2009-12-04 15:40:42 +01:00
|
|
|
0, MYF(MY_WME | MY_WAIT_IF_FULL)) ||
|
|
|
|
DBUG_EVALUATE_IF("fault_injection_openning_index", 1, 0))
|
2005-02-01 15:36:48 +01:00
|
|
|
{
|
2007-10-11 17:07:40 +02:00
|
|
|
/*
|
|
|
|
TODO: all operations creating/deleting the index file or a log, should
|
|
|
|
call my_sync_dir() or my_sync_dir_by_file() to be durable.
|
|
|
|
TODO: file creation should be done with my_create() not my_open().
|
|
|
|
*/
|
2005-02-01 15:36:48 +01:00
|
|
|
if (index_file_nr >= 0)
|
|
|
|
my_close(index_file_nr,MYF(0));
|
|
|
|
return TRUE;
|
|
|
|
}
|
2009-12-04 15:40:42 +01:00
|
|
|
|
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
/*
|
|
|
|
Sync the index by purging any binary log file that is not registered.
|
|
|
|
In other words, either purge binary log files that were removed from
|
|
|
|
the index but not purged from the file system due to a crash or purge
|
|
|
|
any binary log file that was created but not register in the index
|
|
|
|
due to a crash.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (set_purge_index_file_name(index_file_name_arg) ||
|
|
|
|
open_purge_index_file(FALSE) ||
|
|
|
|
purge_index_entry(NULL, NULL, need_mutex) ||
|
|
|
|
close_purge_index_file() ||
|
|
|
|
DBUG_EVALUATE_IF("fault_injection_recovering_index", 1, 0))
|
|
|
|
{
|
|
|
|
sql_print_error("MYSQL_BIN_LOG::open_index_file failed to sync the index "
|
|
|
|
"file.");
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-02-01 15:36:48 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2006-05-05 08:45:58 +02:00
|
|
|
Open a (new) binlog file.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
- Open the log file and the index file. Register the new
|
2007-10-11 19:29:09 +02:00
|
|
|
file name in it
|
2002-08-08 02:12:02 +02:00
|
|
|
- When calling this when the file is in use, you must have a locks
|
2007-10-11 19:29:09 +02:00
|
|
|
on LOCK_log and LOCK_index.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2002-08-08 02:12:02 +02:00
|
|
|
0 ok
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2002-08-08 02:12:02 +02:00
|
|
|
1 error
|
|
|
|
*/
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
bool MYSQL_BIN_LOG::open(const char *log_name,
|
|
|
|
enum_log_type log_type_arg,
|
|
|
|
const char *new_name,
|
|
|
|
enum cache_type io_cache_type_arg,
|
|
|
|
bool no_auto_events_arg,
|
|
|
|
ulong max_size_arg,
|
2009-12-04 15:40:42 +01:00
|
|
|
bool null_created_arg,
|
|
|
|
bool need_mutex)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2005-02-01 15:36:48 +01:00
|
|
|
File file= -1;
|
2009-12-04 15:40:42 +01:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::open");
|
2005-02-01 15:36:48 +01:00
|
|
|
DBUG_PRINT("enter",("log_type: %d",(int) log_type_arg));
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2009-12-04 15:40:42 +01:00
|
|
|
if (init_and_set_log_file_name(log_name, new_name, log_type_arg,
|
|
|
|
io_cache_type_arg))
|
|
|
|
{
|
|
|
|
sql_print_error("MSYQL_BIN_LOG::open failed to generate new file name.");
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
if (open_purge_index_file(TRUE) ||
|
|
|
|
register_create_index_entry(log_file_name) ||
|
|
|
|
sync_purge_index_file() ||
|
|
|
|
DBUG_EVALUATE_IF("fault_injection_registering_index", 1, 0))
|
|
|
|
{
|
|
|
|
sql_print_error("MSYQL_BIN_LOG::open failed to sync the index file.");
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
DBUG_EXECUTE_IF("crash_create_non_critical_before_update_index", abort(););
|
|
|
|
#endif
|
|
|
|
|
|
|
|
write_error= 0;
|
2002-06-05 22:04:38 +02:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
/* open the main log file */
|
2009-12-04 15:40:42 +01:00
|
|
|
if (MYSQL_LOG::open(log_name, log_type_arg, new_name,
|
|
|
|
io_cache_type_arg))
|
|
|
|
{
|
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
close_purge_index_file();
|
|
|
|
#endif
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_RETURN(1); /* all warnings issued */
|
2009-12-04 15:40:42 +01:00
|
|
|
}
|
2004-02-19 09:11:46 +01:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
init(no_auto_events_arg, max_size_arg);
|
2005-02-01 15:36:48 +01:00
|
|
|
|
2002-06-05 22:04:38 +02:00
|
|
|
open_count++;
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_ASSERT(log_type == LOG_BIN);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
bool write_file_name_to_index_file=0;
|
|
|
|
|
|
|
|
if (!my_b_filelength(&log_file))
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
The binary log file was empty (probably newly created)
|
|
|
|
This is the normal case and happens when the user doesn't specify
|
|
|
|
an extension for the binary log files.
|
|
|
|
In this case we write a standard header to it.
|
|
|
|
*/
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_safe_write(&log_file, (uchar*) BINLOG_MAGIC,
|
2003-08-20 15:25:44 +02:00
|
|
|
BIN_LOG_HEADER_SIZE))
|
2002-04-02 06:46:23 +02:00
|
|
|
goto err;
|
2004-11-12 04:01:46 +01:00
|
|
|
bytes_written+= BIN_LOG_HEADER_SIZE;
|
|
|
|
write_file_name_to_index_file= 1;
|
2002-04-02 06:46:23 +02:00
|
|
|
}
|
2001-06-21 21:19:24 +02:00
|
|
|
|
2002-01-20 03:16:52 +01:00
|
|
|
if (need_start_event && !no_auto_events)
|
2001-11-11 06:24:12 +01:00
|
|
|
{
|
2004-11-12 04:01:46 +01:00
|
|
|
/*
|
|
|
|
In 4.x we set need_start_event=0 here, but in 5.0 we want a Start event
|
|
|
|
even if this is not the very first binlog.
|
|
|
|
*/
|
|
|
|
Format_description_log_event s(BINLOG_VERSION);
|
2005-03-14 17:53:24 +01:00
|
|
|
/*
|
|
|
|
don't set LOG_EVENT_BINLOG_IN_USE_F for SEQ_READ_APPEND io_cache
|
|
|
|
as we won't be able to reset it later
|
|
|
|
*/
|
|
|
|
if (io_cache_type == WRITE_CACHE)
|
|
|
|
s.flags|= LOG_EVENT_BINLOG_IN_USE_F;
|
2004-11-12 04:01:46 +01:00
|
|
|
if (!s.is_valid())
|
|
|
|
goto err;
|
2007-08-14 14:20:05 +02:00
|
|
|
s.dont_set_created= null_created_arg;
|
2004-11-12 04:01:46 +01:00
|
|
|
if (s.write(&log_file))
|
|
|
|
goto err;
|
|
|
|
bytes_written+= s.data_written;
|
|
|
|
}
|
|
|
|
if (description_event_for_queue &&
|
|
|
|
description_event_for_queue->binlog_version>=4)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
This is a relay log written to by the I/O slave thread.
|
|
|
|
Write the event so that others can later know the format of this relay
|
|
|
|
log.
|
|
|
|
Note that this event is very close to the original event from the
|
|
|
|
master (it has binlog version of the master, event types of the
|
|
|
|
master), so this is suitable to parse the next relay log's event. It
|
|
|
|
has been produced by
|
2004-12-06 10:38:56 +01:00
|
|
|
Format_description_log_event::Format_description_log_event(char* buf,).
|
2004-11-12 04:01:46 +01:00
|
|
|
Why don't we want to write the description_event_for_queue if this
|
|
|
|
event is for format<4 (3.23 or 4.x): this is because in that case, the
|
|
|
|
description_event_for_queue describes the data received from the
|
|
|
|
master, but not the data written to the relay log (*conversion*),
|
|
|
|
which is in format 4 (slave's).
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
Set 'created' to 0, so that in next relay logs this event does not
|
|
|
|
trigger cleaning actions on the slave in
|
2006-11-01 15:35:37 +01:00
|
|
|
Format_description_log_event::apply_event_impl().
|
2004-11-12 04:01:46 +01:00
|
|
|
*/
|
|
|
|
description_event_for_queue->created= 0;
|
|
|
|
/* Don't set log_pos in event header */
|
2008-09-28 09:34:25 +02:00
|
|
|
description_event_for_queue->set_artificial_event();
|
2005-02-01 15:36:48 +01:00
|
|
|
|
2004-11-12 04:01:46 +01:00
|
|
|
if (description_event_for_queue->write(&log_file))
|
|
|
|
goto err;
|
|
|
|
bytes_written+= description_event_for_queue->data_written;
|
2001-11-11 06:24:12 +01:00
|
|
|
}
|
2004-06-20 19:11:02 +02:00
|
|
|
if (flush_io_cache(&log_file) ||
|
|
|
|
my_sync(log_file.file, MYF(MY_WME)))
|
2000-11-16 19:47:28 +01:00
|
|
|
goto err;
|
2002-08-08 02:12:02 +02:00
|
|
|
|
|
|
|
if (write_file_name_to_index_file)
|
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
DBUG_EXECUTE_IF("crash_create_critical_before_update_index", abort(););
|
|
|
|
#endif
|
|
|
|
|
|
|
|
DBUG_ASSERT(my_b_inited(&index_file) != 0);
|
|
|
|
reinit_io_cache(&index_file, WRITE_CACHE,
|
|
|
|
my_b_filelength(&index_file), 0, 0);
|
2004-06-20 19:11:02 +02:00
|
|
|
/*
|
|
|
|
As this is a new log file, we write the file name to the index
|
|
|
|
file. As every time we write to the index file, we sync it.
|
|
|
|
*/
|
2009-12-04 15:40:42 +01:00
|
|
|
if (DBUG_EVALUATE_IF("fault_injection_updating_index", 1, 0) ||
|
|
|
|
my_b_write(&index_file, (uchar*) log_file_name,
|
|
|
|
strlen(log_file_name)) ||
|
|
|
|
my_b_write(&index_file, (uchar*) "\n", 1) ||
|
|
|
|
flush_io_cache(&index_file) ||
|
2004-06-20 19:11:02 +02:00
|
|
|
my_sync(index_file.file, MYF(MY_WME)))
|
2009-12-04 15:40:42 +01:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
DBUG_EXECUTE_IF("crash_create_after_update_index", abort(););
|
|
|
|
#endif
|
2000-11-16 19:47:28 +01:00
|
|
|
}
|
2002-08-08 02:12:02 +02:00
|
|
|
}
|
2006-06-05 03:34:34 +02:00
|
|
|
log_state= LOG_OPENED;
|
|
|
|
|
2009-12-04 15:40:42 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
close_purge_index_file();
|
|
|
|
#endif
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_RETURN(0);
|
2000-11-15 22:00:06 +01:00
|
|
|
|
|
|
|
err:
|
2009-12-04 15:40:42 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
if (is_inited_purge_index_file())
|
|
|
|
purge_index_entry(NULL, NULL, need_mutex);
|
|
|
|
close_purge_index_file();
|
|
|
|
#endif
|
2003-04-03 20:19:13 +02:00
|
|
|
sql_print_error("Could not use %s for logging (error %d). \
|
|
|
|
Turning logging off for the whole duration of the MySQL server process. \
|
|
|
|
To turn it on again: fix the cause, \
|
2005-02-01 15:36:48 +01:00
|
|
|
shutdown the MySQL server and restart it.", name, errno);
|
2000-11-15 22:00:06 +01:00
|
|
|
if (file >= 0)
|
|
|
|
my_close(file,MYF(0));
|
|
|
|
end_io_cache(&log_file);
|
2002-08-08 02:12:02 +02:00
|
|
|
end_io_cache(&index_file);
|
|
|
|
safeFree(name);
|
2006-06-05 03:34:34 +02:00
|
|
|
log_state= LOG_CLOSED;
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_RETURN(1);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
int MYSQL_BIN_LOG::get_current_log(LOG_INFO* linfo)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
pthread_mutex_lock(&LOCK_log);
|
2006-09-04 13:43:34 +02:00
|
|
|
int ret = raw_get_current_log(linfo);
|
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-09-04 14:26:18 +02:00
|
|
|
int MYSQL_BIN_LOG::raw_get_current_log(LOG_INFO* linfo)
|
2006-09-04 13:43:34 +02:00
|
|
|
{
|
2000-11-15 22:00:06 +01:00
|
|
|
strmake(linfo->log_file_name, log_file_name, sizeof(linfo->log_file_name)-1);
|
|
|
|
linfo->pos = my_b_tell(&log_file);
|
2000-07-31 21:29:14 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Move all data up in a file in an filename index file.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
|
|
|
We do the copy outside of the IO_CACHE as the cache buffers would just
|
|
|
|
make things slower and more complicated.
|
|
|
|
In most cases the copy loop should only do one read.
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param index_file File to move
|
|
|
|
@param offset Move everything from here to beginning
|
|
|
|
|
|
|
|
@note
|
|
|
|
File will be truncated to be 'offset' shorter or filled up with newlines
|
|
|
|
|
|
|
|
@retval
|
2002-08-08 02:12:02 +02:00
|
|
|
0 ok
|
|
|
|
*/
|
|
|
|
|
2006-12-14 23:51:37 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
static bool copy_up_file_and_fill(IO_CACHE *index_file, my_off_t offset)
|
|
|
|
{
|
|
|
|
int bytes_read;
|
|
|
|
my_off_t init_offset= offset;
|
|
|
|
File file= index_file->file;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar io_buf[IO_SIZE*2];
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_ENTER("copy_up_file_and_fill");
|
|
|
|
|
|
|
|
for (;; offset+= bytes_read)
|
|
|
|
{
|
|
|
|
(void) my_seek(file, offset, MY_SEEK_SET, MYF(0));
|
|
|
|
if ((bytes_read= (int) my_read(file, io_buf, sizeof(io_buf), MYF(MY_WME)))
|
|
|
|
< 0)
|
|
|
|
goto err;
|
|
|
|
if (!bytes_read)
|
|
|
|
break; // end of file
|
|
|
|
(void) my_seek(file, offset-init_offset, MY_SEEK_SET, MYF(0));
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_write(file, io_buf, bytes_read, MYF(MY_WME | MY_NABP)))
|
2002-08-08 02:12:02 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
/* The following will either truncate the file or fill the end with \n' */
|
2004-06-20 19:11:02 +02:00
|
|
|
if (my_chsize(file, offset - init_offset, '\n', MYF(MY_WME)) ||
|
|
|
|
my_sync(file, MYF(MY_WME)))
|
2002-08-08 02:12:02 +02:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* Reset data in old index cache */
|
|
|
|
reinit_io_cache(index_file, READ_CACHE, (my_off_t) 0, 0, 1);
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
|
|
|
err:
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
2006-12-14 23:51:37 +01:00
|
|
|
#endif /* HAVE_REPLICATION */
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Find the position in the log-index-file for the given log name.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param linfo Store here the found log file name and position to
|
|
|
|
the NEXT log file name in the index file.
|
|
|
|
@param log_name Filename to find in the index file.
|
|
|
|
Is a null pointer if we want to read the first entry
|
|
|
|
@param need_lock Set this to 1 if the parent doesn't already have a
|
|
|
|
lock on LOCK_index
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
2002-09-11 05:40:08 +02:00
|
|
|
On systems without the truncate function the file will end with one or
|
|
|
|
more empty lines. These will be ignored when reading the file.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2002-08-08 02:12:02 +02:00
|
|
|
0 ok
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
|
|
|
LOG_INFO_EOF End of log-index-file found
|
|
|
|
@retval
|
2002-08-08 02:12:02 +02:00
|
|
|
LOG_INFO_IO Got IO error while reading file
|
|
|
|
*/
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
int MYSQL_BIN_LOG::find_log_pos(LOG_INFO *linfo, const char *log_name,
|
2002-08-08 02:12:02 +02:00
|
|
|
bool need_lock)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
int error= 0;
|
|
|
|
char *fname= linfo->log_file_name;
|
|
|
|
uint log_name_len= log_name ? (uint) strlen(log_name) : 0;
|
|
|
|
DBUG_ENTER("find_log_pos");
|
|
|
|
DBUG_PRINT("enter",("log_name: %s", log_name ? log_name : "NULL"));
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2002-06-05 22:04:38 +02:00
|
|
|
/*
|
2005-02-01 15:36:48 +01:00
|
|
|
Mutex needed because we need to make sure the file pointer does not
|
|
|
|
move from under our feet
|
2002-06-05 22:04:38 +02:00
|
|
|
*/
|
2002-08-08 02:12:02 +02:00
|
|
|
if (need_lock)
|
2002-01-20 03:16:52 +01:00
|
|
|
pthread_mutex_lock(&LOCK_index);
|
2002-08-08 02:12:02 +02:00
|
|
|
safe_mutex_assert_owner(&LOCK_index);
|
|
|
|
|
|
|
|
/* As the file is flushed, we can't get an error here */
|
|
|
|
(void) reinit_io_cache(&index_file, READ_CACHE, (my_off_t) 0, 0, 0);
|
|
|
|
|
2002-06-05 22:04:38 +02:00
|
|
|
for (;;)
|
2000-11-13 22:55:10 +01:00
|
|
|
{
|
2000-11-15 22:00:06 +01:00
|
|
|
uint length;
|
2002-08-08 02:12:02 +02:00
|
|
|
my_off_t offset= my_b_tell(&index_file);
|
|
|
|
|
2009-11-20 14:30:35 +01:00
|
|
|
DBUG_EXECUTE_IF("simulate_find_log_pos_error",
|
|
|
|
error= LOG_INFO_EOF; break;);
|
|
|
|
/* If we get 0 or 1 characters, this is the end of the file */
|
2002-08-08 02:12:02 +02:00
|
|
|
if ((length= my_b_gets(&index_file, fname, FN_REFLEN)) <= 1)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
/* Did not find the given entry; Return not found or error */
|
|
|
|
error= !index_file.error ? LOG_INFO_EOF : LOG_INFO_IO;
|
|
|
|
break;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
// if the log entry matches, null string matching anything
|
|
|
|
if (!log_name ||
|
2000-11-17 01:48:13 +01:00
|
|
|
(log_name_len == length-1 && fname[log_name_len] == '\n' &&
|
2000-11-13 22:55:10 +01:00
|
|
|
!memcmp(fname, log_name, log_name_len)))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_PRINT("info",("Found log file entry"));
|
2000-11-15 22:00:06 +01:00
|
|
|
fname[length-1]=0; // remove last \n
|
2002-08-08 02:12:02 +02:00
|
|
|
linfo->index_file_start_offset= offset;
|
|
|
|
linfo->index_file_offset = my_b_tell(&index_file);
|
2000-11-13 22:55:10 +01:00
|
|
|
break;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2000-11-13 22:55:10 +01:00
|
|
|
}
|
2000-11-15 22:00:06 +01:00
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
if (need_lock)
|
2002-01-20 03:16:52 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_index);
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_RETURN(error);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2000-10-27 06:11:55 +02:00
|
|
|
|
2000-11-13 22:55:10 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Find the position in the log-index-file for the given log name.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param
|
2002-08-08 02:12:02 +02:00
|
|
|
linfo Store here the next log file name and position to
|
|
|
|
the file name after that.
|
2007-10-11 19:29:09 +02:00
|
|
|
@param
|
2002-08-08 02:12:02 +02:00
|
|
|
need_lock Set this to 1 if the parent doesn't already have a
|
|
|
|
lock on LOCK_index
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
2002-08-08 02:12:02 +02:00
|
|
|
- Before calling this function, one has to call find_log_pos()
|
2007-10-11 19:29:09 +02:00
|
|
|
to set up 'linfo'
|
2002-08-08 02:12:02 +02:00
|
|
|
- Mutex needed because we need to make sure the file pointer does not move
|
2007-10-11 19:29:09 +02:00
|
|
|
from under our feet
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2002-08-08 02:12:02 +02:00
|
|
|
0 ok
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
|
|
|
LOG_INFO_EOF End of log-index-file found
|
|
|
|
@retval
|
2002-08-08 02:12:02 +02:00
|
|
|
LOG_INFO_IO Got IO error while reading file
|
|
|
|
*/
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
int MYSQL_BIN_LOG::find_next_log(LOG_INFO* linfo, bool need_lock)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
int error= 0;
|
2000-11-15 22:00:06 +01:00
|
|
|
uint length;
|
2002-08-08 02:12:02 +02:00
|
|
|
char *fname= linfo->log_file_name;
|
|
|
|
|
2002-01-20 03:16:52 +01:00
|
|
|
if (need_lock)
|
|
|
|
pthread_mutex_lock(&LOCK_index);
|
2002-08-08 02:12:02 +02:00
|
|
|
safe_mutex_assert_owner(&LOCK_index);
|
|
|
|
|
|
|
|
/* As the file is flushed, we can't get an error here */
|
|
|
|
(void) reinit_io_cache(&index_file, READ_CACHE, linfo->index_file_offset, 0,
|
|
|
|
0);
|
|
|
|
|
|
|
|
linfo->index_file_start_offset= linfo->index_file_offset;
|
|
|
|
if ((length=my_b_gets(&index_file, fname, FN_REFLEN)) <= 1)
|
2000-11-15 22:00:06 +01:00
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
error = !index_file.error ? LOG_INFO_EOF : LOG_INFO_IO;
|
2000-11-15 22:00:06 +01:00
|
|
|
goto err;
|
|
|
|
}
|
2005-01-16 13:16:23 +01:00
|
|
|
fname[length-1]=0; // kill \n
|
2002-08-08 02:12:02 +02:00
|
|
|
linfo->index_file_offset = my_b_tell(&index_file);
|
2000-11-15 22:00:06 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
err:
|
2002-01-20 03:16:52 +01:00
|
|
|
if (need_lock)
|
|
|
|
pthread_mutex_unlock(&LOCK_index);
|
2000-07-31 21:29:14 +02:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2002-01-29 17:32:16 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Delete all logs refered to in the index file.
|
|
|
|
Start writing to a new log file.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
The new index file will only contain this file.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param thd Thread
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
|
|
|
If not called from slave thread, write start event to new log
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2002-08-08 02:12:02 +02:00
|
|
|
0 ok
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2002-08-08 02:12:02 +02:00
|
|
|
1 error
|
|
|
|
*/
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
bool MYSQL_BIN_LOG::reset_logs(THD* thd)
|
2002-01-20 03:16:52 +01:00
|
|
|
{
|
|
|
|
LOG_INFO linfo;
|
2002-08-08 02:12:02 +02:00
|
|
|
bool error=0;
|
2009-11-20 14:30:35 +01:00
|
|
|
int err;
|
2002-01-20 03:16:52 +01:00
|
|
|
const char* save_name;
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_ENTER("reset_logs");
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2006-01-12 19:51:02 +01:00
|
|
|
ha_reset_logs(thd);
|
2002-08-08 02:12:02 +02:00
|
|
|
/*
|
|
|
|
We need to get both locks to be sure that no one is trying to
|
|
|
|
write to the index log file.
|
|
|
|
*/
|
2002-01-20 03:16:52 +01:00
|
|
|
pthread_mutex_lock(&LOCK_log);
|
2002-08-08 02:12:02 +02:00
|
|
|
pthread_mutex_lock(&LOCK_index);
|
2005-10-03 18:34:42 +02:00
|
|
|
|
2005-02-21 13:47:57 +01:00
|
|
|
/*
|
|
|
|
The following mutex is needed to ensure that no threads call
|
|
|
|
'delete thd' as we would then risk missing a 'rollback' from this
|
|
|
|
thread. If the transaction involved MyISAM tables, it should go
|
|
|
|
into binlog even on rollback.
|
|
|
|
*/
|
2009-11-24 14:54:59 +01:00
|
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
2002-08-08 02:12:02 +02:00
|
|
|
|
|
|
|
/* Save variables so that we can reopen the log */
|
|
|
|
save_name=name;
|
|
|
|
name=0; // Protect against free
|
2003-07-14 13:59:26 +02:00
|
|
|
close(LOG_CLOSE_TO_BE_OPENED);
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2009-12-04 15:40:42 +01:00
|
|
|
/*
|
|
|
|
First delete all old log files and then update the index file.
|
|
|
|
As we first delete the log files and do not use sort of logging,
|
|
|
|
a crash may lead to an inconsistent state where the index has
|
|
|
|
references to non-existent files.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2009-12-04 15:40:42 +01:00
|
|
|
We need to invert the steps and use the purge_index_file methods
|
|
|
|
in order to make the operation safe.
|
|
|
|
*/
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2009-11-20 14:30:35 +01:00
|
|
|
if ((err= find_log_pos(&linfo, NullS, 0)) != 0)
|
2002-01-20 03:16:52 +01:00
|
|
|
{
|
2009-11-20 14:30:35 +01:00
|
|
|
uint errcode= purge_log_get_error_code(err);
|
|
|
|
sql_print_error("Failed to locate old binlog or relay log files");
|
|
|
|
my_message(errcode, ER(errcode), MYF(0));
|
|
|
|
error= 1;
|
2002-01-20 03:16:52 +01:00
|
|
|
goto err;
|
|
|
|
}
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2002-06-05 22:04:38 +02:00
|
|
|
for (;;)
|
2002-01-20 03:16:52 +01:00
|
|
|
{
|
2008-03-29 23:54:08 +01:00
|
|
|
if ((error= my_delete_allow_opened(linfo.log_file_name, MYF(0))) != 0)
|
|
|
|
{
|
|
|
|
if (my_errno == ENOENT)
|
|
|
|
{
|
|
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE),
|
|
|
|
linfo.log_file_name);
|
|
|
|
sql_print_information("Failed to delete file '%s'",
|
|
|
|
linfo.log_file_name);
|
|
|
|
my_errno= 0;
|
|
|
|
error= 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-09-10 11:18:29 +02:00
|
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
2008-03-29 23:54:08 +01:00
|
|
|
ER_BINLOG_PURGE_FATAL_ERR,
|
|
|
|
"a problem with deleting %s; "
|
|
|
|
"consider examining correspondence "
|
|
|
|
"of your binlog index file "
|
|
|
|
"to the actual binlog files",
|
|
|
|
linfo.log_file_name);
|
|
|
|
error= 1;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
2002-08-08 02:12:02 +02:00
|
|
|
if (find_next_log(&linfo, 0))
|
2002-01-20 03:16:52 +01:00
|
|
|
break;
|
|
|
|
}
|
2002-08-08 02:12:02 +02:00
|
|
|
|
|
|
|
/* Start logging with a new file */
|
2003-07-14 22:49:19 +02:00
|
|
|
close(LOG_CLOSE_INDEX);
|
2008-03-29 23:54:08 +01:00
|
|
|
if ((error= my_delete_allow_opened(index_file_name, MYF(0)))) // Reset (open will update)
|
|
|
|
{
|
|
|
|
if (my_errno == ENOENT)
|
|
|
|
{
|
|
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE),
|
|
|
|
index_file_name);
|
|
|
|
sql_print_information("Failed to delete file '%s'",
|
|
|
|
index_file_name);
|
|
|
|
my_errno= 0;
|
|
|
|
error= 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-09-10 11:18:29 +02:00
|
|
|
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
2008-03-29 23:54:08 +01:00
|
|
|
ER_BINLOG_PURGE_FATAL_ERR,
|
|
|
|
"a problem with deleting %s; "
|
|
|
|
"consider examining correspondence "
|
|
|
|
"of your binlog index file "
|
|
|
|
"to the actual binlog files",
|
|
|
|
index_file_name);
|
|
|
|
error= 1;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
2002-08-08 02:12:02 +02:00
|
|
|
if (!thd->slave_thread)
|
2002-01-20 03:16:52 +01:00
|
|
|
need_start_event=1;
|
2009-12-04 15:40:42 +01:00
|
|
|
if (!open_index_file(index_file_name, 0, FALSE))
|
|
|
|
open(save_name, log_type, 0, io_cache_type, no_auto_events, max_size, 0, FALSE);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free((uchar*) save_name, MYF(0));
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2005-02-01 15:36:48 +01:00
|
|
|
err:
|
2009-11-20 14:30:35 +01:00
|
|
|
if (error == 1)
|
|
|
|
name= const_cast<char*>(save_name);
|
2009-11-24 14:54:59 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
2002-08-08 02:12:02 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_index);
|
2002-01-20 03:16:52 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_RETURN(error);
|
2002-01-20 03:16:52 +01:00
|
|
|
}
|
|
|
|
|
2002-01-29 17:32:16 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2003-04-24 15:29:25 +02:00
|
|
|
Delete relay log files prior to rli->group_relay_log_name
|
|
|
|
(i.e. all logs which are not involved in a non-finished group
|
2007-10-11 19:29:09 +02:00
|
|
|
(transaction)), remove them from the index file and start on next
|
|
|
|
relay log.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
IMPLEMENTATION
|
|
|
|
- Protects index file with LOCK_index
|
|
|
|
- Delete relevant relay log files
|
|
|
|
- Copy all file names after these ones to the front of the index file
|
|
|
|
- If the OS has truncate, truncate the file, else fill it with \n'
|
|
|
|
- Read the next file name from the index file and store in rli->linfo
|
|
|
|
|
|
|
|
@param rli Relay log information
|
|
|
|
@param included If false, all relay logs that are strictly before
|
|
|
|
rli->group_relay_log_name are deleted ; if true, the
|
|
|
|
latter is deleted too (i.e. all relay logs
|
|
|
|
read by the SQL slave thread are deleted).
|
|
|
|
|
|
|
|
@note
|
2002-08-08 02:12:02 +02:00
|
|
|
- This is only called from the slave-execute thread when it has read
|
2007-10-11 19:29:09 +02:00
|
|
|
all commands from a relay log and want to switch to a new relay log.
|
2003-04-24 15:29:25 +02:00
|
|
|
- When this happens, we can be in an active transaction as
|
2007-10-11 19:29:09 +02:00
|
|
|
a transaction can span over two relay logs
|
|
|
|
(although it is always written as a single block to the master's binary
|
|
|
|
log, hence cannot span over two master's binary logs).
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2002-08-12 02:33:46 +02:00
|
|
|
0 ok
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
|
|
|
LOG_INFO_EOF End of log-index-file found
|
|
|
|
@retval
|
2002-08-12 02:33:46 +02:00
|
|
|
LOG_INFO_SEEK Could not allocate IO cache
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2002-08-12 02:33:46 +02:00
|
|
|
LOG_INFO_IO Got IO error while reading file
|
2002-08-08 02:12:02 +02:00
|
|
|
*/
|
|
|
|
|
2003-01-15 09:11:44 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
2002-12-16 14:33:29 +01:00
|
|
|
|
2007-08-16 07:37:50 +02:00
|
|
|
int MYSQL_BIN_LOG::purge_first_log(Relay_log_info* rli, bool included)
|
2002-01-20 03:16:52 +01:00
|
|
|
{
|
2002-08-12 02:33:46 +02:00
|
|
|
int error;
|
2008-12-04 02:01:03 +01:00
|
|
|
char *to_purge_if_included= NULL;
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_ENTER("purge_first_log");
|
|
|
|
|
2002-06-11 10:20:31 +02:00
|
|
|
DBUG_ASSERT(is_open());
|
|
|
|
DBUG_ASSERT(rli->slave_running == 1);
|
2003-04-24 15:29:25 +02:00
|
|
|
DBUG_ASSERT(!strcmp(rli->linfo.log_file_name,rli->event_relay_log_name));
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2002-01-20 03:16:52 +01:00
|
|
|
pthread_mutex_lock(&LOCK_index);
|
2008-12-04 02:01:03 +01:00
|
|
|
to_purge_if_included= my_strdup(rli->group_relay_log_name, MYF(0));
|
2002-01-29 17:32:16 +01:00
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
/*
|
|
|
|
Read the next log file name from the index file and pass it back to
|
2008-12-04 02:01:03 +01:00
|
|
|
the caller.
|
2002-08-08 02:12:02 +02:00
|
|
|
*/
|
2008-12-04 02:01:03 +01:00
|
|
|
if((error=find_log_pos(&rli->linfo, rli->event_relay_log_name, 0)) ||
|
|
|
|
(error=find_next_log(&rli->linfo, 0)))
|
2002-08-08 02:12:02 +02:00
|
|
|
{
|
|
|
|
char buff[22];
|
2003-04-24 15:29:25 +02:00
|
|
|
sql_print_error("next log error: %d offset: %s log: %s included: %d",
|
|
|
|
error,
|
|
|
|
llstr(rli->linfo.index_file_offset,buff),
|
2008-12-04 02:01:03 +01:00
|
|
|
rli->event_relay_log_name,
|
2003-04-24 15:29:25 +02:00
|
|
|
included);
|
2002-08-08 02:12:02 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2003-04-24 15:29:25 +02:00
|
|
|
|
2002-12-11 14:46:39 +01:00
|
|
|
/*
|
2003-04-24 15:29:25 +02:00
|
|
|
Reset rli's coordinates to the current log.
|
2002-12-11 14:46:39 +01:00
|
|
|
*/
|
2003-04-24 15:29:25 +02:00
|
|
|
rli->event_relay_log_pos= BIN_LOG_HEADER_SIZE;
|
|
|
|
strmake(rli->event_relay_log_name,rli->linfo.log_file_name,
|
|
|
|
sizeof(rli->event_relay_log_name)-1);
|
|
|
|
|
|
|
|
/*
|
|
|
|
If we removed the rli->group_relay_log_name file,
|
|
|
|
we must update the rli->group* coordinates, otherwise do not touch it as the
|
|
|
|
group's execution is not finished (e.g. COMMIT not executed)
|
|
|
|
*/
|
|
|
|
if (included)
|
|
|
|
{
|
|
|
|
rli->group_relay_log_pos = BIN_LOG_HEADER_SIZE;
|
|
|
|
strmake(rli->group_relay_log_name,rli->linfo.log_file_name,
|
|
|
|
sizeof(rli->group_relay_log_name)-1);
|
2003-09-13 22:13:41 +02:00
|
|
|
rli->notify_group_relay_log_name_update();
|
2003-04-24 15:29:25 +02:00
|
|
|
}
|
2002-08-08 02:12:02 +02:00
|
|
|
|
|
|
|
/* Store where we are in the new file for the execution thread */
|
|
|
|
flush_relay_log_info(rli);
|
2002-01-29 17:32:16 +01:00
|
|
|
|
2008-12-04 02:01:03 +01:00
|
|
|
DBUG_EXECUTE_IF("crash_before_purge_logs", abort(););
|
|
|
|
|
|
|
|
pthread_mutex_lock(&rli->log_space_lock);
|
|
|
|
rli->relay_log.purge_logs(to_purge_if_included, included,
|
|
|
|
0, 0, &rli->log_space_total);
|
|
|
|
// Tell the I/O thread to take the relay_log_space_limit into account
|
|
|
|
rli->ignore_log_space_limit= 0;
|
|
|
|
pthread_mutex_unlock(&rli->log_space_lock);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Ok to broadcast after the critical region as there is no risk of
|
|
|
|
the mutex being destroyed by this thread later - this helps save
|
|
|
|
context switches
|
|
|
|
*/
|
|
|
|
pthread_cond_broadcast(&rli->log_space_cond);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Need to update the log pos because purge logs has been called
|
|
|
|
* after fetching initially the log pos at the begining of the method.
|
|
|
|
*/
|
2008-12-11 12:06:50 +01:00
|
|
|
if((error=find_log_pos(&rli->linfo, rli->event_relay_log_name, 0)))
|
2008-12-04 02:01:03 +01:00
|
|
|
{
|
|
|
|
char buff[22];
|
|
|
|
sql_print_error("next log error: %d offset: %s log: %s included: %d",
|
|
|
|
error,
|
|
|
|
llstr(rli->linfo.index_file_offset,buff),
|
|
|
|
rli->group_relay_log_name,
|
|
|
|
included);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If included was passed, rli->linfo should be the first entry. */
|
|
|
|
DBUG_ASSERT(!included || rli->linfo.index_file_start_offset == 0);
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
err:
|
2008-12-04 02:01:03 +01:00
|
|
|
my_free(to_purge_if_included, MYF(0));
|
2002-01-20 03:16:52 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_index);
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_RETURN(error);
|
2002-01-20 03:16:52 +01:00
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Update log index_file.
|
2003-03-11 10:49:06 +01:00
|
|
|
*/
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
int MYSQL_BIN_LOG::update_log_index(LOG_INFO* log_info, bool need_update_threads)
|
2003-03-11 10:49:06 +01:00
|
|
|
{
|
|
|
|
if (copy_up_file_and_fill(&index_file, log_info->index_file_start_offset))
|
|
|
|
return LOG_INFO_IO;
|
|
|
|
|
|
|
|
// now update offsets in index file for running threads
|
2003-04-24 15:29:25 +02:00
|
|
|
if (need_update_threads)
|
|
|
|
adjust_linfo_offsets(log_info->index_file_start_offset);
|
2003-03-11 10:49:06 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2002-01-29 17:32:16 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2002-08-08 02:12:02 +02:00
|
|
|
Remove all logs before the given log from disk and from the index file.
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param to_log Delete all log file name before this file.
|
|
|
|
@param included If true, to_log is deleted too.
|
|
|
|
@param need_mutex
|
|
|
|
@param need_update_threads If we want to update the log coordinates of
|
|
|
|
all threads. False for relay logs, true otherwise.
|
|
|
|
@param freed_log_space If not null, decrement this variable of
|
|
|
|
the amount of log space freed
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
2002-08-08 02:12:02 +02:00
|
|
|
If any of the logs before the deleted one is in use,
|
|
|
|
only purge logs up to this one.
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
|
|
|
0 ok
|
|
|
|
@retval
|
2002-08-08 02:12:02 +02:00
|
|
|
LOG_INFO_EOF to_log not found
|
2008-03-29 23:54:08 +01:00
|
|
|
LOG_INFO_EMFILE too many files opened
|
2008-03-17 19:19:04 +01:00
|
|
|
LOG_INFO_FATAL if any other than ENOENT error from
|
|
|
|
my_stat() or my_delete()
|
2002-08-08 02:12:02 +02:00
|
|
|
*/
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
int MYSQL_BIN_LOG::purge_logs(const char *to_log,
|
2003-04-24 15:29:25 +02:00
|
|
|
bool included,
|
|
|
|
bool need_mutex,
|
|
|
|
bool need_update_threads,
|
|
|
|
ulonglong *decrease_log_space)
|
2000-10-27 06:11:55 +02:00
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
int error= 0;
|
2003-04-24 15:29:25 +02:00
|
|
|
bool exit_loop= 0;
|
2002-08-08 02:12:02 +02:00
|
|
|
LOG_INFO log_info;
|
2008-07-21 16:41:17 +02:00
|
|
|
THD *thd= current_thd;
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_ENTER("purge_logs");
|
2003-04-24 15:29:25 +02:00
|
|
|
DBUG_PRINT("info",("to_log= %s",to_log));
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2003-04-24 15:29:25 +02:00
|
|
|
if (need_mutex)
|
|
|
|
pthread_mutex_lock(&LOCK_index);
|
2008-12-04 02:01:03 +01:00
|
|
|
if ((error=find_log_pos(&log_info, to_log, 0 /*no mutex*/)))
|
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
sql_print_error("MYSQL_BIN_LOG::purge_logs was called with file %s not "
|
2008-12-04 02:01:03 +01:00
|
|
|
"listed in the index.", to_log);
|
2000-11-16 02:58:58 +01:00
|
|
|
goto err;
|
2008-12-04 02:01:03 +01:00
|
|
|
}
|
|
|
|
|
2009-12-04 15:40:42 +01:00
|
|
|
if ((error= open_purge_index_file(TRUE)))
|
2008-12-04 02:01:03 +01:00
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
sql_print_error("MYSQL_BIN_LOG::purge_logs failed to sync the index file.");
|
|
|
|
goto err;
|
2008-12-04 02:01:03 +01:00
|
|
|
}
|
2000-11-16 02:58:58 +01:00
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
/*
|
2003-04-24 15:29:25 +02:00
|
|
|
File name exists in index file; delete until we find this file
|
2002-08-08 02:12:02 +02:00
|
|
|
or a file that is used.
|
|
|
|
*/
|
|
|
|
if ((error=find_log_pos(&log_info, NullS, 0 /*no mutex*/)))
|
2000-11-16 02:58:58 +01:00
|
|
|
goto err;
|
2003-04-24 15:29:25 +02:00
|
|
|
while ((strcmp(to_log,log_info.log_file_name) || (exit_loop=included)) &&
|
2009-12-04 15:40:42 +01:00
|
|
|
!is_active(log_info.log_file_name) &&
|
2003-04-24 15:29:25 +02:00
|
|
|
!log_in_use(log_info.log_file_name))
|
2000-11-16 02:58:58 +01:00
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
if ((error= register_purge_index_entry(log_info.log_file_name)))
|
2008-12-04 02:01:03 +01:00
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
sql_print_error("MYSQL_BIN_LOG::purge_logs failed to copy %s to register file.",
|
2008-12-04 02:01:03 +01:00
|
|
|
log_info.log_file_name);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (find_next_log(&log_info, 0) || exit_loop)
|
|
|
|
break;
|
2009-12-04 15:40:42 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_EXECUTE_IF("crash_purge_before_update_index", abort(););
|
|
|
|
|
|
|
|
if ((error= sync_purge_index_file()))
|
|
|
|
{
|
|
|
|
sql_print_error("MSYQL_BIN_LOG::purge_logs failed to flush register file.");
|
|
|
|
goto err;
|
|
|
|
}
|
2008-12-04 02:01:03 +01:00
|
|
|
|
|
|
|
/* We know how many files to delete. Update index file. */
|
2008-12-11 12:06:50 +01:00
|
|
|
if ((error=update_log_index(&log_info, need_update_threads)))
|
2008-12-04 02:01:03 +01:00
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
sql_print_error("MSYQL_BIN_LOG::purge_logs failed to update the index file");
|
2008-12-04 02:01:03 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2009-12-04 15:40:42 +01:00
|
|
|
DBUG_EXECUTE_IF("crash_purge_critical_after_update_index", abort(););
|
|
|
|
|
|
|
|
err:
|
|
|
|
/* Read each entry from purge_index_file and delete the file. */
|
|
|
|
if (is_inited_purge_index_file() &&
|
|
|
|
(error= purge_index_entry(thd, decrease_log_space, FALSE)))
|
|
|
|
sql_print_error("MSYQL_BIN_LOG::purge_logs failed to process registered files"
|
|
|
|
" that would be purged.");
|
|
|
|
close_purge_index_file();
|
|
|
|
|
|
|
|
DBUG_EXECUTE_IF("crash_purge_non_critical_after_update_index", abort(););
|
|
|
|
|
|
|
|
if (need_mutex)
|
|
|
|
pthread_mutex_unlock(&LOCK_index);
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
2008-12-04 02:01:03 +01:00
|
|
|
|
2009-12-04 15:40:42 +01:00
|
|
|
int MYSQL_BIN_LOG::set_purge_index_file_name(const char *base_file_name)
|
|
|
|
{
|
|
|
|
int error= 0;
|
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::set_purge_index_file_name");
|
|
|
|
if (fn_format(purge_index_file_name, base_file_name, mysql_data_home,
|
|
|
|
".~rec~", MYF(MY_UNPACK_FILENAME | MY_SAFE_PATH |
|
|
|
|
MY_REPLACE_EXT)) == NULL)
|
2008-12-04 02:01:03 +01:00
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
error= 1;
|
|
|
|
sql_print_error("MYSQL_BIN_LOG::set_purge_index_file_name failed to set "
|
|
|
|
"file name.");
|
|
|
|
}
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
int MYSQL_BIN_LOG::open_purge_index_file(bool destroy)
|
|
|
|
{
|
|
|
|
int error= 0;
|
|
|
|
File file= -1;
|
2008-12-04 02:01:03 +01:00
|
|
|
|
2009-12-04 15:40:42 +01:00
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::open_purge_index_file");
|
|
|
|
|
|
|
|
if (destroy)
|
|
|
|
close_purge_index_file();
|
|
|
|
|
|
|
|
if (!my_b_inited(&purge_index_file))
|
2008-12-04 02:01:03 +01:00
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
if ((file= my_open(purge_index_file_name, O_RDWR | O_CREAT | O_BINARY,
|
|
|
|
MYF(MY_WME | ME_WAITTANG))) < 0 ||
|
|
|
|
init_io_cache(&purge_index_file, file, IO_SIZE,
|
|
|
|
(destroy ? WRITE_CACHE : READ_CACHE),
|
|
|
|
0, 0, MYF(MY_WME | MY_NABP | MY_WAIT_IF_FULL)))
|
|
|
|
{
|
|
|
|
error= 1;
|
|
|
|
sql_print_error("MYSQL_BIN_LOG::open_purge_index_file failed to open register "
|
|
|
|
" file.");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
int MYSQL_BIN_LOG::close_purge_index_file()
|
|
|
|
{
|
|
|
|
int error= 0;
|
|
|
|
|
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::close_purge_index_file");
|
2008-12-04 02:01:03 +01:00
|
|
|
|
2009-12-04 15:40:42 +01:00
|
|
|
if (my_b_inited(&purge_index_file))
|
2008-12-04 02:01:03 +01:00
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
end_io_cache(&purge_index_file);
|
|
|
|
error= my_close(purge_index_file.file, MYF(0));
|
|
|
|
}
|
|
|
|
my_delete(purge_index_file_name, MYF(0));
|
|
|
|
bzero((char*) &purge_index_file, sizeof(purge_index_file));
|
|
|
|
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool MYSQL_BIN_LOG::is_inited_purge_index_file()
|
|
|
|
{
|
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::is_inited_purge_index_file");
|
|
|
|
DBUG_RETURN (my_b_inited(&purge_index_file));
|
|
|
|
}
|
|
|
|
|
|
|
|
int MYSQL_BIN_LOG::sync_purge_index_file()
|
|
|
|
{
|
|
|
|
int error= 0;
|
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::sync_purge_index_file");
|
|
|
|
|
|
|
|
if ((error= flush_io_cache(&purge_index_file)) ||
|
|
|
|
(error= my_sync(purge_index_file.file, MYF(MY_WME))))
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
int MYSQL_BIN_LOG::register_purge_index_entry(const char *entry)
|
|
|
|
{
|
|
|
|
int error= 0;
|
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::register_purge_index_entry");
|
|
|
|
|
|
|
|
if ((error=my_b_write(&purge_index_file, (const uchar*)entry, strlen(entry))) ||
|
|
|
|
(error=my_b_write(&purge_index_file, (const uchar*)"\n", 1)))
|
|
|
|
DBUG_RETURN (error);
|
|
|
|
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
int MYSQL_BIN_LOG::register_create_index_entry(const char *entry)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::register_create_index_entry");
|
|
|
|
DBUG_RETURN(register_purge_index_entry(entry));
|
|
|
|
}
|
|
|
|
|
|
|
|
int MYSQL_BIN_LOG::purge_index_entry(THD *thd, ulonglong *decrease_log_space,
|
|
|
|
bool need_mutex)
|
|
|
|
{
|
|
|
|
MY_STAT s;
|
|
|
|
int error= 0;
|
|
|
|
LOG_INFO log_info;
|
|
|
|
LOG_INFO check_log_info;
|
|
|
|
|
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG:purge_index_entry");
|
|
|
|
|
|
|
|
DBUG_ASSERT(my_b_inited(&purge_index_file));
|
|
|
|
|
|
|
|
if ((error=reinit_io_cache(&purge_index_file, READ_CACHE, 0, 0, 0)))
|
|
|
|
{
|
|
|
|
sql_print_error("MSYQL_BIN_LOG::purge_index_entry failed to reinit register file "
|
2008-12-04 02:01:03 +01:00
|
|
|
"for read");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
uint length;
|
|
|
|
|
2009-12-04 15:40:42 +01:00
|
|
|
if ((length=my_b_gets(&purge_index_file, log_info.log_file_name,
|
2008-12-04 02:01:03 +01:00
|
|
|
FN_REFLEN)) <= 1)
|
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
if (purge_index_file.error)
|
2008-12-04 02:01:03 +01:00
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
error= purge_index_file.error;
|
|
|
|
sql_print_error("MSYQL_BIN_LOG::purge_index_entry error %d reading from "
|
|
|
|
"register file.", error);
|
2008-12-04 02:01:03 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Reached EOF */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get rid of the trailing '\n' */
|
|
|
|
log_info.log_file_name[length-1]= 0;
|
|
|
|
|
2008-03-17 19:19:04 +01:00
|
|
|
if (!my_stat(log_info.log_file_name, &s, MYF(0)))
|
2003-04-24 15:29:25 +02:00
|
|
|
{
|
2008-03-17 19:19:04 +01:00
|
|
|
if (my_errno == ENOENT)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
It's not fatal if we can't stat a log file that does not exist;
|
|
|
|
If we could not stat, we won't delete.
|
2008-07-24 14:28:21 +02:00
|
|
|
*/
|
2008-07-21 16:41:17 +02:00
|
|
|
if (thd)
|
|
|
|
{
|
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE),
|
|
|
|
log_info.log_file_name);
|
|
|
|
}
|
2008-03-17 19:19:04 +01:00
|
|
|
sql_print_information("Failed to execute my_stat on file '%s'",
|
2005-07-12 06:01:26 +02:00
|
|
|
log_info.log_file_name);
|
2008-03-17 19:19:04 +01:00
|
|
|
my_errno= 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Other than ENOENT are fatal
|
|
|
|
*/
|
2008-07-21 16:41:17 +02:00
|
|
|
if (thd)
|
|
|
|
{
|
2009-09-10 11:18:29 +02:00
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
2008-07-21 16:41:17 +02:00
|
|
|
ER_BINLOG_PURGE_FATAL_ERR,
|
|
|
|
"a problem with getting info on being purged %s; "
|
|
|
|
"consider examining correspondence "
|
|
|
|
"of your binlog index file "
|
|
|
|
"to the actual binlog files",
|
|
|
|
log_info.log_file_name);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sql_print_information("Failed to delete log file '%s'; "
|
|
|
|
"consider examining correspondence "
|
|
|
|
"of your binlog index file "
|
|
|
|
"to the actual binlog files",
|
|
|
|
log_info.log_file_name);
|
|
|
|
}
|
2008-03-17 19:19:04 +01:00
|
|
|
error= LOG_INFO_FATAL;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
if ((error= find_log_pos(&check_log_info, log_info.log_file_name, need_mutex)))
|
2008-03-17 19:19:04 +01:00
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
if (error != LOG_INFO_EOF)
|
2008-03-17 19:19:04 +01:00
|
|
|
{
|
2008-07-21 16:41:17 +02:00
|
|
|
if (thd)
|
|
|
|
{
|
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
2009-12-04 15:40:42 +01:00
|
|
|
ER_BINLOG_PURGE_FATAL_ERR,
|
|
|
|
"a problem with deleting %s and "
|
|
|
|
"reading the binlog index file",
|
2008-07-21 16:41:17 +02:00
|
|
|
log_info.log_file_name);
|
|
|
|
}
|
2009-12-04 15:40:42 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
sql_print_information("Failed to delete file '%s' and "
|
|
|
|
"read the binlog index file",
|
|
|
|
log_info.log_file_name);
|
|
|
|
}
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
error= 0;
|
|
|
|
if (!need_mutex)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
This is to avoid triggering an error in NDB.
|
|
|
|
*/
|
|
|
|
ha_binlog_index_purge_file(current_thd, log_info.log_file_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_PRINT("info",("purging %s",log_info.log_file_name));
|
|
|
|
if (!my_delete(log_info.log_file_name, MYF(0)))
|
|
|
|
{
|
|
|
|
if (decrease_log_space)
|
|
|
|
*decrease_log_space-= s.st_size;
|
2008-03-17 19:19:04 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
if (my_errno == ENOENT)
|
2008-07-24 14:28:21 +02:00
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
if (thd)
|
|
|
|
{
|
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
|
|
ER_LOG_PURGE_NO_FILE, ER(ER_LOG_PURGE_NO_FILE),
|
|
|
|
log_info.log_file_name);
|
|
|
|
}
|
|
|
|
sql_print_information("Failed to delete file '%s'",
|
|
|
|
log_info.log_file_name);
|
|
|
|
my_errno= 0;
|
2008-07-24 14:28:21 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-12-04 15:40:42 +01:00
|
|
|
if (thd)
|
|
|
|
{
|
2009-12-16 20:52:56 +01:00
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
2009-12-04 15:40:42 +01:00
|
|
|
ER_BINLOG_PURGE_FATAL_ERR,
|
|
|
|
"a problem with deleting %s; "
|
2008-07-24 14:28:21 +02:00
|
|
|
"consider examining correspondence "
|
|
|
|
"of your binlog index file "
|
|
|
|
"to the actual binlog files",
|
|
|
|
log_info.log_file_name);
|
2009-12-04 15:40:42 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sql_print_information("Failed to delete file '%s'; "
|
|
|
|
"consider examining correspondence "
|
|
|
|
"of your binlog index file "
|
|
|
|
"to the actual binlog files",
|
|
|
|
log_info.log_file_name);
|
|
|
|
}
|
|
|
|
if (my_errno == EMFILE)
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info",
|
|
|
|
("my_errno: %d, set ret = LOG_INFO_EMFILE", my_errno));
|
|
|
|
error= LOG_INFO_EMFILE;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
error= LOG_INFO_FATAL;
|
2008-07-21 11:18:35 +02:00
|
|
|
goto err;
|
2008-03-29 23:54:08 +01:00
|
|
|
}
|
2008-03-17 19:19:04 +01:00
|
|
|
}
|
|
|
|
}
|
2003-04-24 15:29:25 +02:00
|
|
|
}
|
2006-10-13 06:48:05 +02:00
|
|
|
}
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2000-10-27 06:11:55 +02:00
|
|
|
err:
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_RETURN(error);
|
2000-10-27 06:11:55 +02:00
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2003-02-16 17:39:12 +01:00
|
|
|
Remove all logs before the given file date from disk and from the
|
|
|
|
index file.
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param thd Thread pointer
|
2008-12-04 15:07:56 +01:00
|
|
|
@param purge_time Delete all log files before given date.
|
2003-02-16 17:39:12 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
2003-02-16 17:39:12 +01:00
|
|
|
If any of the logs before the deleted one is in use,
|
|
|
|
only purge logs up to this one.
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2003-02-16 17:39:12 +01:00
|
|
|
0 ok
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2003-02-16 17:39:12 +01:00
|
|
|
LOG_INFO_PURGE_NO_ROTATE Binary file that can't be rotated
|
2008-03-17 19:19:04 +01:00
|
|
|
LOG_INFO_FATAL if any other than ENOENT error from
|
|
|
|
my_stat() or my_delete()
|
2003-02-16 17:39:12 +01:00
|
|
|
*/
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
int MYSQL_BIN_LOG::purge_logs_before_date(time_t purge_time)
|
2003-02-16 17:39:12 +01:00
|
|
|
{
|
|
|
|
int error;
|
2008-12-04 02:01:03 +01:00
|
|
|
char to_log[FN_REFLEN];
|
2003-02-16 17:39:12 +01:00
|
|
|
LOG_INFO log_info;
|
|
|
|
MY_STAT stat_area;
|
2008-07-21 16:41:17 +02:00
|
|
|
THD *thd= current_thd;
|
2008-07-24 14:28:21 +02:00
|
|
|
|
2003-02-16 17:39:12 +01:00
|
|
|
DBUG_ENTER("purge_logs_before_date");
|
|
|
|
|
|
|
|
pthread_mutex_lock(&LOCK_index);
|
2008-12-04 02:01:03 +01:00
|
|
|
to_log[0]= 0;
|
2003-02-16 17:39:12 +01:00
|
|
|
|
|
|
|
if ((error=find_log_pos(&log_info, NullS, 0 /*no mutex*/)))
|
2000-10-27 06:11:55 +02:00
|
|
|
goto err;
|
2003-02-16 17:39:12 +01:00
|
|
|
|
|
|
|
while (strcmp(log_file_name, log_info.log_file_name) &&
|
2009-12-04 15:40:42 +01:00
|
|
|
!is_active(log_info.log_file_name) &&
|
|
|
|
!log_in_use(log_info.log_file_name))
|
2003-02-16 17:39:12 +01:00
|
|
|
{
|
2008-03-17 19:19:04 +01:00
|
|
|
if (!my_stat(log_info.log_file_name, &stat_area, MYF(0)))
|
|
|
|
{
|
|
|
|
if (my_errno == ENOENT)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
It's not fatal if we can't stat a log file that does not exist.
|
2008-07-21 16:41:17 +02:00
|
|
|
*/
|
2008-03-17 19:19:04 +01:00
|
|
|
my_errno= 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Other than ENOENT are fatal
|
|
|
|
*/
|
2008-07-21 16:41:17 +02:00
|
|
|
if (thd)
|
|
|
|
{
|
2009-09-10 11:18:29 +02:00
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
2008-07-21 16:41:17 +02:00
|
|
|
ER_BINLOG_PURGE_FATAL_ERR,
|
|
|
|
"a problem with getting info on being purged %s; "
|
|
|
|
"consider examining correspondence "
|
|
|
|
"of your binlog index file "
|
|
|
|
"to the actual binlog files",
|
|
|
|
log_info.log_file_name);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sql_print_information("Failed to delete log file '%s'",
|
|
|
|
log_info.log_file_name);
|
|
|
|
}
|
2008-03-17 19:19:04 +01:00
|
|
|
error= LOG_INFO_FATAL;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-12-04 02:01:03 +01:00
|
|
|
if (stat_area.st_mtime < purge_time)
|
|
|
|
strmake(to_log,
|
|
|
|
log_info.log_file_name,
|
|
|
|
sizeof(log_info.log_file_name));
|
|
|
|
else
|
2008-03-17 19:19:04 +01:00
|
|
|
break;
|
|
|
|
}
|
2003-02-16 17:39:12 +01:00
|
|
|
if (find_next_log(&log_info, 0))
|
|
|
|
break;
|
2000-10-27 06:11:55 +02:00
|
|
|
}
|
2000-11-16 02:58:58 +01:00
|
|
|
|
2008-12-04 02:01:03 +01:00
|
|
|
error= (to_log[0] ? purge_logs(to_log, 1, 0, 1, (ulonglong *) 0) : 0);
|
2000-11-16 02:58:58 +01:00
|
|
|
|
2000-10-27 06:11:55 +02:00
|
|
|
err:
|
|
|
|
pthread_mutex_unlock(&LOCK_index);
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_RETURN(error);
|
2000-10-27 06:11:55 +02:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif /* HAVE_REPLICATION */
|
2002-12-16 14:33:29 +01:00
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Create a new log file name.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param buf buf of at least FN_REFLEN where new name is stored
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
2002-08-08 02:12:02 +02:00
|
|
|
If file name will be longer then FN_REFLEN it will be truncated
|
|
|
|
*/
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
void MYSQL_BIN_LOG::make_log_name(char* buf, const char* log_ident)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2003-07-11 14:26:44 +02:00
|
|
|
uint dir_len = dirname_length(log_file_name);
|
2007-12-06 11:48:27 +01:00
|
|
|
if (dir_len >= FN_REFLEN)
|
2003-07-11 14:26:44 +02:00
|
|
|
dir_len=FN_REFLEN-1;
|
|
|
|
strnmov(buf, log_file_name, dir_len);
|
2007-11-26 08:20:40 +01:00
|
|
|
strmake(buf+dir_len, log_ident, FN_REFLEN - dir_len -1);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Check if we are writing/reading to the given log file.
|
2002-08-08 02:12:02 +02:00
|
|
|
*/
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
bool MYSQL_BIN_LOG::is_active(const char *log_file_name_arg)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2003-07-11 14:26:44 +02:00
|
|
|
return !strcmp(log_file_name, log_file_name_arg);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
/*
|
|
|
|
Wrappers around new_file_impl to avoid using argument
|
|
|
|
to control locking. The argument 1) less readable 2) breaks
|
|
|
|
incapsulation 3) allows external access to the class without
|
|
|
|
a lock (which is not possible with private new_file_without_locking
|
|
|
|
method).
|
|
|
|
*/
|
|
|
|
|
|
|
|
void MYSQL_BIN_LOG::new_file()
|
|
|
|
{
|
|
|
|
new_file_impl(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MYSQL_BIN_LOG::new_file_without_locking()
|
|
|
|
{
|
|
|
|
new_file_impl(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Start writing to a new log file or reopen the old file.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param need_lock Set to 1 if caller has not locked LOCK_log
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
2002-08-08 02:12:02 +02:00
|
|
|
The new file name is stored last in the index file
|
|
|
|
*/
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
void MYSQL_BIN_LOG::new_file_impl(bool need_lock)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
char new_name[FN_REFLEN], *new_name_ptr, *old_name;
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::new_file_impl");
|
2002-08-08 02:12:02 +02:00
|
|
|
if (!is_open())
|
2003-07-06 17:59:54 +02:00
|
|
|
{
|
|
|
|
DBUG_PRINT("info",("log is closed"));
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
2002-08-08 02:12:02 +02:00
|
|
|
|
|
|
|
if (need_lock)
|
|
|
|
pthread_mutex_lock(&LOCK_log);
|
2005-03-02 10:38:25 +01:00
|
|
|
pthread_mutex_lock(&LOCK_index);
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
safe_mutex_assert_owner(&LOCK_log);
|
|
|
|
safe_mutex_assert_owner(&LOCK_index);
|
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
/*
|
|
|
|
if binlog is used as tc log, be sure all xids are "unlogged",
|
|
|
|
so that on recover we only need to scan one - latest - binlog file
|
|
|
|
for prepared xids. As this is expected to be a rare event,
|
|
|
|
simple wait strategy is enough. We're locking LOCK_log to be sure no
|
|
|
|
new Xid_log_event's are added to the log (and prepared_xids is not
|
|
|
|
increased), and waiting on COND_prep_xids for late threads to
|
|
|
|
catch up.
|
|
|
|
*/
|
|
|
|
if (prepared_xids)
|
|
|
|
{
|
|
|
|
tc_log_page_waits++;
|
|
|
|
pthread_mutex_lock(&LOCK_prep_xids);
|
2006-11-10 15:10:41 +01:00
|
|
|
while (prepared_xids) {
|
|
|
|
DBUG_PRINT("info", ("prepared_xids=%lu", prepared_xids));
|
2005-01-16 13:16:23 +01:00
|
|
|
pthread_cond_wait(&COND_prep_xids, &LOCK_prep_xids);
|
2006-11-10 15:10:41 +01:00
|
|
|
}
|
2005-01-16 13:16:23 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_prep_xids);
|
|
|
|
}
|
|
|
|
|
2003-07-14 09:12:05 +02:00
|
|
|
/* Reuse old name if not binlog and not update log */
|
2002-09-05 15:17:08 +02:00
|
|
|
new_name_ptr= name;
|
2001-10-31 17:27:49 +01:00
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
/*
|
2003-07-12 15:48:26 +02:00
|
|
|
If user hasn't specified an extension, generate a new log name
|
|
|
|
We have to do this here and not in open as we want to store the
|
|
|
|
new file name in the current binary log file.
|
2002-08-08 02:12:02 +02:00
|
|
|
*/
|
2003-07-12 15:48:26 +02:00
|
|
|
if (generate_new_name(new_name, name))
|
|
|
|
goto end;
|
|
|
|
new_name_ptr=new_name;
|
2005-02-01 15:36:48 +01:00
|
|
|
|
2003-07-12 15:48:26 +02:00
|
|
|
if (log_type == LOG_BIN)
|
2002-08-08 02:12:02 +02:00
|
|
|
{
|
2003-07-12 15:48:26 +02:00
|
|
|
if (!no_auto_events)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
/*
|
2003-07-12 15:48:26 +02:00
|
|
|
We log the whole file name for log file as the user may decide
|
|
|
|
to change base names at some point.
|
2002-08-08 02:12:02 +02:00
|
|
|
*/
|
2005-12-22 06:39:02 +01:00
|
|
|
Rotate_log_event r(new_name+dirname_length(new_name),
|
2008-09-28 09:34:25 +02:00
|
|
|
0, LOG_EVENT_OFFSET, is_relay_log ? Rotate_log_event::RELAY_LOG : 0);
|
2003-07-12 15:48:26 +02:00
|
|
|
r.write(&log_file);
|
2004-11-12 04:01:46 +01:00
|
|
|
bytes_written += r.data_written;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2003-07-12 15:48:26 +02:00
|
|
|
/*
|
|
|
|
Update needs to be signalled even if there is no rotate event
|
|
|
|
log rotation should give the waiting thread a signal to
|
|
|
|
discover EOF and move on to the next log.
|
|
|
|
*/
|
2005-02-01 15:36:48 +01:00
|
|
|
signal_update();
|
2002-08-08 02:12:02 +02:00
|
|
|
}
|
|
|
|
old_name=name;
|
|
|
|
name=0; // Don't free name
|
2009-10-20 10:39:40 +02:00
|
|
|
close(LOG_CLOSE_TO_BE_OPENED | LOG_CLOSE_INDEX);
|
2003-07-08 15:50:57 +02:00
|
|
|
|
2005-02-01 15:36:48 +01:00
|
|
|
/*
|
2006-06-05 03:34:34 +02:00
|
|
|
Note that at this point, log_state != LOG_CLOSED (important for is_open()).
|
2003-07-11 14:26:44 +02:00
|
|
|
*/
|
2003-07-08 15:50:57 +02:00
|
|
|
|
2005-02-01 15:36:48 +01:00
|
|
|
/*
|
2004-11-12 04:01:46 +01:00
|
|
|
new_file() is only used for rotation (in FLUSH LOGS or because size >
|
2005-02-01 15:36:48 +01:00
|
|
|
max_binlog_size or max_relay_log_size).
|
2004-11-12 04:01:46 +01:00
|
|
|
If this is a binary log, the Format_description_log_event at the beginning of
|
|
|
|
the new file should have created=0 (to distinguish with the
|
|
|
|
Format_description_log_event written at server startup, which should
|
|
|
|
trigger temp tables deletion on slaves.
|
2005-02-01 15:36:48 +01:00
|
|
|
*/
|
2004-11-12 04:01:46 +01:00
|
|
|
|
2009-10-20 10:39:40 +02:00
|
|
|
/* reopen index binlog file, BUG#34582 */
|
2009-12-04 15:40:42 +01:00
|
|
|
if (!open_index_file(index_file_name, 0, FALSE))
|
|
|
|
open(old_name, log_type, new_name_ptr,
|
|
|
|
io_cache_type, no_auto_events, max_size, 1, FALSE);
|
2002-08-08 02:12:02 +02:00
|
|
|
my_free(old_name,MYF(0));
|
|
|
|
|
2002-08-22 15:50:58 +02:00
|
|
|
end:
|
2002-08-08 02:12:02 +02:00
|
|
|
if (need_lock)
|
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
2005-03-02 10:38:25 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_index);
|
|
|
|
|
2003-07-06 17:59:54 +02:00
|
|
|
DBUG_VOID_RETURN;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
bool MYSQL_BIN_LOG::append(Log_event* ev)
|
2002-01-25 06:49:47 +01:00
|
|
|
{
|
|
|
|
bool error = 0;
|
|
|
|
pthread_mutex_lock(&LOCK_log);
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::append");
|
2003-07-06 17:59:54 +02:00
|
|
|
|
2002-01-25 06:49:47 +01:00
|
|
|
DBUG_ASSERT(log_file.type == SEQ_READ_APPEND);
|
2002-06-11 10:20:31 +02:00
|
|
|
/*
|
|
|
|
Log_event::write() is smart enough to use my_b_write() or
|
|
|
|
my_b_append() depending on the kind of cache we have.
|
|
|
|
*/
|
2002-01-25 06:49:47 +01:00
|
|
|
if (ev->write(&log_file))
|
|
|
|
{
|
|
|
|
error=1;
|
|
|
|
goto err;
|
|
|
|
}
|
2004-11-12 04:01:46 +01:00
|
|
|
bytes_written+= ev->data_written;
|
2003-07-08 23:55:07 +02:00
|
|
|
DBUG_PRINT("info",("max_size: %lu",max_size));
|
2009-09-29 16:27:12 +02:00
|
|
|
if (flush_and_sync(0))
|
|
|
|
goto err;
|
2003-07-06 17:59:54 +02:00
|
|
|
if ((uint) my_b_append_tell(&log_file) > max_size)
|
2006-05-05 08:45:58 +02:00
|
|
|
new_file_without_locking();
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2005-02-22 00:15:31 +01:00
|
|
|
err:
|
2002-01-25 06:49:47 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
2002-08-08 02:12:02 +02:00
|
|
|
signal_update(); // Safe as we don't call close
|
2003-07-06 17:59:54 +02:00
|
|
|
DBUG_RETURN(error);
|
2002-01-25 06:49:47 +01:00
|
|
|
}
|
|
|
|
|
2002-06-11 10:20:31 +02:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
bool MYSQL_BIN_LOG::appendv(const char* buf, uint len,...)
|
2002-01-20 03:16:52 +01:00
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
bool error= 0;
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::appendv");
|
2002-01-20 03:16:52 +01:00
|
|
|
va_list(args);
|
|
|
|
va_start(args,len);
|
2005-03-02 10:38:25 +01:00
|
|
|
|
2002-01-25 06:49:47 +01:00
|
|
|
DBUG_ASSERT(log_file.type == SEQ_READ_APPEND);
|
2005-03-02 10:38:25 +01:00
|
|
|
|
2005-10-12 13:29:55 +02:00
|
|
|
safe_mutex_assert_owner(&LOCK_log);
|
2002-01-20 03:16:52 +01:00
|
|
|
do
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_append(&log_file,(uchar*) buf,len))
|
2002-01-20 03:16:52 +01:00
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
error= 1;
|
|
|
|
goto err;
|
2002-01-20 03:16:52 +01:00
|
|
|
}
|
2002-04-02 06:46:23 +02:00
|
|
|
bytes_written += len;
|
2002-01-20 03:16:52 +01:00
|
|
|
} while ((buf=va_arg(args,const char*)) && (len=va_arg(args,uint)));
|
2003-07-08 23:55:07 +02:00
|
|
|
DBUG_PRINT("info",("max_size: %lu",max_size));
|
2009-09-29 16:27:12 +02:00
|
|
|
if (flush_and_sync(0))
|
|
|
|
goto err;
|
2003-07-06 17:59:54 +02:00
|
|
|
if ((uint) my_b_append_tell(&log_file) > max_size)
|
2006-05-05 08:45:58 +02:00
|
|
|
new_file_without_locking();
|
2002-08-08 02:12:02 +02:00
|
|
|
|
|
|
|
err:
|
2002-01-20 03:16:52 +01:00
|
|
|
if (!error)
|
|
|
|
signal_update();
|
2003-07-06 17:59:54 +02:00
|
|
|
DBUG_RETURN(error);
|
2002-01-20 03:16:52 +01:00
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2009-09-29 16:27:12 +02:00
|
|
|
bool MYSQL_BIN_LOG::flush_and_sync(bool *synced)
|
2004-06-10 15:56:13 +02:00
|
|
|
{
|
2005-04-05 13:17:49 +02:00
|
|
|
int err=0, fd=log_file.file;
|
2009-09-29 16:27:12 +02:00
|
|
|
if (synced)
|
|
|
|
*synced= 0;
|
2005-04-05 13:17:49 +02:00
|
|
|
safe_mutex_assert_owner(&LOCK_log);
|
|
|
|
if (flush_io_cache(&log_file))
|
|
|
|
return 1;
|
2009-09-29 16:27:12 +02:00
|
|
|
uint sync_period= get_sync_period();
|
|
|
|
if (sync_period && ++sync_counter >= sync_period)
|
2004-11-12 04:01:46 +01:00
|
|
|
{
|
2009-09-29 16:27:12 +02:00
|
|
|
sync_counter= 0;
|
2005-04-05 13:17:49 +02:00
|
|
|
err=my_sync(fd, MYF(MY_WME));
|
2009-09-29 16:27:12 +02:00
|
|
|
if (synced)
|
|
|
|
*synced= 1;
|
2004-11-12 04:01:46 +01:00
|
|
|
}
|
2005-04-05 13:17:49 +02:00
|
|
|
return err;
|
2004-06-10 15:56:13 +02:00
|
|
|
}
|
|
|
|
|
2007-02-26 20:06:10 +01:00
|
|
|
void MYSQL_BIN_LOG::start_union_events(THD *thd, query_id_t query_id_param)
|
2005-08-25 15:34:34 +02:00
|
|
|
{
|
|
|
|
DBUG_ASSERT(!thd->binlog_evt_union.do_union);
|
|
|
|
thd->binlog_evt_union.do_union= TRUE;
|
|
|
|
thd->binlog_evt_union.unioned_events= FALSE;
|
|
|
|
thd->binlog_evt_union.unioned_events_trans= FALSE;
|
2007-02-26 20:06:10 +01:00
|
|
|
thd->binlog_evt_union.first_query_id= query_id_param;
|
2005-08-25 15:34:34 +02:00
|
|
|
}
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
void MYSQL_BIN_LOG::stop_union_events(THD *thd)
|
2005-08-25 15:34:34 +02:00
|
|
|
{
|
|
|
|
DBUG_ASSERT(thd->binlog_evt_union.do_union);
|
|
|
|
thd->binlog_evt_union.do_union= FALSE;
|
|
|
|
}
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
bool MYSQL_BIN_LOG::is_query_in_union(THD *thd, query_id_t query_id_param)
|
2005-09-07 17:39:47 +02:00
|
|
|
{
|
|
|
|
return (thd->binlog_evt_union.do_union &&
|
|
|
|
query_id_param >= thd->binlog_evt_union.first_query_id);
|
|
|
|
}
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
These functions are placed in this file since they need access to
|
|
|
|
binlog_hton, which has internal linkage.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int THD::binlog_setup_trx_data()
|
|
|
|
{
|
|
|
|
DBUG_ENTER("THD::binlog_setup_trx_data");
|
|
|
|
binlog_trx_data *trx_data=
|
2007-08-31 08:19:52 +02:00
|
|
|
(binlog_trx_data*) thd_get_ha_data(this, binlog_hton);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
if (trx_data)
|
|
|
|
DBUG_RETURN(0); // Already set up
|
|
|
|
|
2007-08-31 08:19:52 +02:00
|
|
|
trx_data= (binlog_trx_data*) my_malloc(sizeof(binlog_trx_data), MYF(MY_ZEROFILL));
|
2005-12-22 06:39:02 +01:00
|
|
|
if (!trx_data ||
|
|
|
|
open_cached_file(&trx_data->trans_log, mysql_tmpdir,
|
|
|
|
LOG_PREFIX, binlog_cache_size, MYF(MY_WME)))
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free((uchar*)trx_data, MYF(MY_ALLOW_ZERO_PTR));
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_RETURN(1); // Didn't manage to set it up
|
|
|
|
}
|
2007-08-31 08:19:52 +02:00
|
|
|
thd_set_ha_data(this, binlog_hton, trx_data);
|
2006-10-05 10:46:14 +02:00
|
|
|
|
2007-08-31 08:19:52 +02:00
|
|
|
trx_data= new (thd_get_ha_data(this, binlog_hton)) binlog_trx_data;
|
2006-10-05 10:46:14 +02:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2006-03-08 21:49:49 +01:00
|
|
|
/*
|
2006-10-05 10:46:14 +02:00
|
|
|
Function to start a statement and optionally a transaction for the
|
|
|
|
binary log.
|
2006-03-08 21:49:49 +01:00
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
SYNOPSIS
|
|
|
|
binlog_start_trans_and_stmt()
|
2006-03-08 21:49:49 +01:00
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
This function does three things:
|
|
|
|
- Start a transaction if not in autocommit mode or if a BEGIN
|
|
|
|
statement has been seen.
|
|
|
|
|
|
|
|
- Start a statement transaction to allow us to truncate the binary
|
|
|
|
log.
|
|
|
|
|
|
|
|
- Save the currrent binlog position so that we can roll back the
|
|
|
|
statement by truncating the transaction log.
|
|
|
|
|
|
|
|
We only update the saved position if the old one was undefined,
|
|
|
|
the reason is that there are some cases (e.g., for CREATE-SELECT)
|
|
|
|
where the position is saved twice (e.g., both in
|
|
|
|
select_create::prepare() and THD::binlog_write_table_map()) , but
|
|
|
|
we should use the first. This means that calls to this function
|
|
|
|
can be used to start the statement before the first table map
|
|
|
|
event, to include some extra events.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
|
|
|
THD::binlog_start_trans_and_stmt()
|
|
|
|
{
|
2007-08-31 08:19:52 +02:00
|
|
|
binlog_trx_data *trx_data= (binlog_trx_data*) thd_get_ha_data(this, binlog_hton);
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_ENTER("binlog_start_trans_and_stmt");
|
|
|
|
DBUG_PRINT("enter", ("trx_data: 0x%lx trx_data->before_stmt_pos: %lu",
|
|
|
|
(long) trx_data,
|
|
|
|
(trx_data ? (ulong) trx_data->before_stmt_pos :
|
|
|
|
(ulong) 0)));
|
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
if (trx_data == NULL ||
|
2006-10-06 08:41:34 +02:00
|
|
|
trx_data->before_stmt_pos == MY_OFF_T_UNDEF)
|
2006-10-05 10:46:14 +02:00
|
|
|
{
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
this->binlog_set_stmt_begin();
|
2009-12-03 23:46:14 +01:00
|
|
|
if (in_multi_stmt_transaction())
|
2006-10-05 22:16:19 +02:00
|
|
|
trans_register_ha(this, TRUE, binlog_hton);
|
|
|
|
trans_register_ha(this, FALSE, binlog_hton);
|
2008-02-19 12:43:01 +01:00
|
|
|
/*
|
|
|
|
Mark statement transaction as read/write. We never start
|
|
|
|
a binary log transaction and keep it read-only,
|
|
|
|
therefore it's best to mark the transaction read/write just
|
|
|
|
at the same time we start it.
|
|
|
|
Not necessary to mark the normal transaction read/write
|
|
|
|
since the statement-level flag will be propagated automatically
|
|
|
|
inside ha_commit_trans.
|
|
|
|
*/
|
|
|
|
ha_data[binlog_hton->slot].ha_info[0].set_trx_read_write();
|
2006-10-05 10:46:14 +02:00
|
|
|
}
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
void THD::binlog_set_stmt_begin() {
|
|
|
|
binlog_trx_data *trx_data=
|
2007-08-31 08:19:52 +02:00
|
|
|
(binlog_trx_data*) thd_get_ha_data(this, binlog_hton);
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
The call to binlog_trans_log_savepos() might create the trx_data
|
|
|
|
structure, if it didn't exist before, so we save the position
|
|
|
|
into an auto variable and then write it into the transaction
|
|
|
|
data for the binary log (i.e., trx_data).
|
|
|
|
*/
|
|
|
|
my_off_t pos= 0;
|
|
|
|
binlog_trans_log_savepos(this, &pos);
|
2007-08-31 08:19:52 +02:00
|
|
|
trx_data= (binlog_trx_data*) thd_get_ha_data(this, binlog_hton);
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
trx_data->before_stmt_pos= pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
/*
|
|
|
|
Write a table map to the binary log.
|
2006-03-08 21:49:49 +01:00
|
|
|
*/
|
|
|
|
|
2006-02-16 08:30:53 +01:00
|
|
|
int THD::binlog_write_table_map(TABLE *table, bool is_trans)
|
|
|
|
{
|
2006-03-29 13:27:36 +02:00
|
|
|
int error;
|
2006-02-16 08:30:53 +01:00
|
|
|
DBUG_ENTER("THD::binlog_write_table_map");
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("enter", ("table: 0x%lx (%s: #%lu)",
|
|
|
|
(long) table, table->s->table_name.str,
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
table->s->table_map_id));
|
2006-02-16 08:30:53 +01:00
|
|
|
|
|
|
|
/* Pre-conditions */
|
2006-03-03 09:49:46 +01:00
|
|
|
DBUG_ASSERT(current_stmt_binlog_row_based && mysql_bin_log.is_open());
|
2006-02-16 08:30:53 +01:00
|
|
|
DBUG_ASSERT(table->s->table_map_id != ULONG_MAX);
|
|
|
|
|
|
|
|
Table_map_log_event::flag_set const
|
|
|
|
flags= Table_map_log_event::TM_NO_FLAGS;
|
|
|
|
|
|
|
|
Table_map_log_event
|
|
|
|
the_event(this, table, table->s->table_map_id, is_trans, flags);
|
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
if (is_trans && binlog_table_maps == 0)
|
|
|
|
binlog_start_trans_and_stmt();
|
2006-02-16 08:30:53 +01:00
|
|
|
|
2006-03-29 13:27:36 +02:00
|
|
|
if ((error= mysql_bin_log.write(&the_event)))
|
2006-02-16 08:30:53 +01:00
|
|
|
DBUG_RETURN(error);
|
|
|
|
|
2006-03-29 13:27:36 +02:00
|
|
|
binlog_table_maps++;
|
2006-02-16 08:30:53 +01:00
|
|
|
table->s->table_map_version= mysql_bin_log.table_map_version();
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
Rows_log_event*
|
|
|
|
THD::binlog_get_pending_rows_event() const
|
|
|
|
{
|
|
|
|
binlog_trx_data *const trx_data=
|
2007-08-31 08:19:52 +02:00
|
|
|
(binlog_trx_data*) thd_get_ha_data(this, binlog_hton);
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
|
|
|
This is less than ideal, but here's the story: If there is no
|
|
|
|
trx_data, prepare_pending_rows_event() has never been called
|
|
|
|
(since the trx_data is set up there). In that case, we just return
|
|
|
|
NULL.
|
|
|
|
*/
|
2006-10-05 10:46:14 +02:00
|
|
|
return trx_data ? trx_data->pending() : NULL;
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
THD::binlog_set_pending_rows_event(Rows_log_event* ev)
|
|
|
|
{
|
2007-08-31 08:19:52 +02:00
|
|
|
if (thd_get_ha_data(this, binlog_hton) == NULL)
|
2006-02-16 08:30:53 +01:00
|
|
|
binlog_setup_trx_data();
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
binlog_trx_data *const trx_data=
|
2007-08-31 08:19:52 +02:00
|
|
|
(binlog_trx_data*) thd_get_ha_data(this, binlog_hton);
|
2006-02-16 08:30:53 +01:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_ASSERT(trx_data);
|
2006-10-05 10:46:14 +02:00
|
|
|
trx_data->set_pending(ev);
|
2005-12-22 06:39:02 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-09-03 22:04:07 +02:00
|
|
|
/**
|
|
|
|
Remove the pending rows event, discarding any outstanding rows.
|
|
|
|
|
|
|
|
If there is no pending rows event available, this is effectively a
|
|
|
|
no-op.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
MYSQL_BIN_LOG::remove_pending_rows_event(THD *thd)
|
|
|
|
{
|
2008-10-21 14:18:38 +02:00
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::remove_pending_rows_event");
|
2008-09-03 22:04:07 +02:00
|
|
|
|
|
|
|
binlog_trx_data *const trx_data=
|
|
|
|
(binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);
|
|
|
|
|
|
|
|
DBUG_ASSERT(trx_data);
|
|
|
|
|
|
|
|
if (Rows_log_event* pending= trx_data->pending())
|
|
|
|
{
|
|
|
|
delete pending;
|
|
|
|
trx_data->set_pending(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
|
|
|
Moves the last bunch of rows from the pending Rows event to the binlog
|
|
|
|
(either cached binlog if transaction, or disk binlog). Sets a new pending
|
|
|
|
event.
|
|
|
|
*/
|
2006-10-05 10:46:14 +02:00
|
|
|
int
|
|
|
|
MYSQL_BIN_LOG::flush_and_set_pending_rows_event(THD *thd,
|
|
|
|
Rows_log_event* event)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::flush_and_set_pending_rows_event(event)");
|
2006-08-16 14:55:57 +02:00
|
|
|
DBUG_ASSERT(mysql_bin_log.is_open());
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("enter", ("event: 0x%lx", (long) event));
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
int error= 0;
|
|
|
|
|
|
|
|
binlog_trx_data *const trx_data=
|
2007-08-31 08:19:52 +02:00
|
|
|
(binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
DBUG_ASSERT(trx_data);
|
|
|
|
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("info", ("trx_data->pending(): 0x%lx", (long) trx_data->pending()));
|
2006-02-24 16:19:55 +01:00
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
if (Rows_log_event* pending= trx_data->pending())
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
|
|
|
IO_CACHE *file= &log_file;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Decide if we should write to the log file directly or to the
|
|
|
|
transaction log.
|
|
|
|
*/
|
|
|
|
if (pending->get_cache_stmt() || my_b_tell(&trx_data->trans_log))
|
|
|
|
file= &trx_data->trans_log;
|
|
|
|
|
|
|
|
/*
|
|
|
|
If we are writing to the log file directly, we could avoid
|
|
|
|
locking the log. This does not work since we need to step the
|
|
|
|
m_table_map_version below, and that change has to be protected
|
|
|
|
by the LOCK_log mutex.
|
|
|
|
*/
|
|
|
|
pthread_mutex_lock(&LOCK_log);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Write pending event to log file or transaction cache
|
|
|
|
*/
|
|
|
|
if (pending->write(file))
|
|
|
|
{
|
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
set_write_error(thd);
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
We step the table map version if we are writing an event
|
|
|
|
representing the end of a statement. We do this regardless of
|
|
|
|
wheather we write to the transaction cache or to directly to the
|
|
|
|
file.
|
|
|
|
|
|
|
|
In an ideal world, we could avoid stepping the table map version
|
|
|
|
if we were writing to a transaction cache, since we could then
|
|
|
|
reuse the table map that was written earlier in the transaction
|
|
|
|
cache. This does not work since STMT_END_F implies closing all
|
|
|
|
table mappings on the slave side.
|
|
|
|
|
|
|
|
TODO: Find a solution so that table maps does not have to be
|
|
|
|
written several times within a transaction.
|
|
|
|
*/
|
|
|
|
if (pending->get_flags(Rows_log_event::STMT_END_F))
|
|
|
|
++m_table_map_version;
|
|
|
|
|
|
|
|
delete pending;
|
|
|
|
|
|
|
|
if (file == &log_file)
|
|
|
|
{
|
2009-09-29 16:27:12 +02:00
|
|
|
error= flush_and_sync(0);
|
2005-12-22 06:39:02 +01:00
|
|
|
if (!error)
|
|
|
|
{
|
|
|
|
signal_update();
|
|
|
|
rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
|
|
|
}
|
|
|
|
|
2006-02-16 08:30:53 +01:00
|
|
|
thd->binlog_set_pending_rows_event(event);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Write an event to the binary log.
|
2002-08-08 02:12:02 +02:00
|
|
|
*/
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
bool MYSQL_BIN_LOG::write(Log_event *event_info)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2005-02-22 00:15:31 +01:00
|
|
|
THD *thd= event_info->thd;
|
|
|
|
bool error= 1;
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::write(Log_event *)");
|
2005-02-22 00:15:31 +01:00
|
|
|
|
2005-08-25 15:34:34 +02:00
|
|
|
if (thd->binlog_evt_union.do_union)
|
|
|
|
{
|
2005-08-27 00:33:06 +02:00
|
|
|
/*
|
|
|
|
In Stored function; Remember that function call caused an update.
|
|
|
|
We will log the function call to the binary log on function exit
|
|
|
|
*/
|
2005-08-25 15:34:34 +02:00
|
|
|
thd->binlog_evt_union.unioned_events= TRUE;
|
|
|
|
thd->binlog_evt_union.unioned_events_trans |= event_info->cache_stmt;
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Flush the pending rows event to the transaction cache or to the
|
|
|
|
log file. Since this function potentially aquire the LOCK_log
|
|
|
|
mutex, we do this before aquiring the LOCK_log mutex in this
|
|
|
|
function.
|
|
|
|
|
2006-02-16 08:30:53 +01:00
|
|
|
We only end the statement if we are in a top-level statement. If
|
|
|
|
we are inside a stored function, we do not end the statement since
|
|
|
|
this will close all tables on the slave.
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
2006-02-16 08:30:53 +01:00
|
|
|
bool const end_stmt=
|
2009-12-01 15:39:03 +01:00
|
|
|
thd->locked_tables_mode && thd->lex->requires_prelocking();
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
if (thd->binlog_flush_pending_rows_event(end_stmt))
|
|
|
|
DBUG_RETURN(error);
|
2005-12-22 06:39:02 +01:00
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
pthread_mutex_lock(&LOCK_log);
|
|
|
|
|
2005-02-22 00:15:31 +01:00
|
|
|
/*
|
2003-07-11 14:26:44 +02:00
|
|
|
In most cases this is only called if 'is_open()' is true; in fact this is
|
|
|
|
mostly called if is_open() *was* true a few instructions before, but it
|
|
|
|
could have changed since.
|
|
|
|
*/
|
2005-01-16 13:16:23 +01:00
|
|
|
if (likely(is_open()))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2003-08-28 05:08:17 +02:00
|
|
|
IO_CACHE *file= &log_file;
|
2003-01-15 09:11:44 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
2005-02-22 00:15:31 +01:00
|
|
|
/*
|
2006-12-14 23:51:37 +01:00
|
|
|
In the future we need to add to the following if tests like
|
|
|
|
"do the involved tables match (to be implemented)
|
|
|
|
binlog_[wild_]{do|ignore}_table?" (WL#1049)"
|
2003-07-14 09:12:05 +02:00
|
|
|
*/
|
2006-12-14 23:51:37 +01:00
|
|
|
const char *local_db= event_info->get_db();
|
2004-03-26 19:25:22 +01:00
|
|
|
if ((thd && !(thd->options & OPTION_BIN_LOG)) ||
|
2005-03-21 23:05:55 +01:00
|
|
|
(!binlog_filter->db_ok(local_db)))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2009-11-24 14:54:59 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
2002-11-07 03:02:37 +01:00
|
|
|
DBUG_RETURN(0);
|
2000-12-07 13:08:48 +01:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif /* HAVE_REPLICATION */
|
2002-01-22 21:57:56 +01:00
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
/*
|
|
|
|
Should we write to the binlog cache or to the binlog on disk?
|
|
|
|
Write to the binlog cache if:
|
|
|
|
- it is already not empty (meaning we're in a transaction; note that the
|
|
|
|
present event could be about a non-transactional table, but still we need
|
|
|
|
to write to the binlog cache in that case to handle updates to mixed
|
|
|
|
trans/non-trans table types the best possible in binlogging)
|
2005-05-06 10:39:30 +02:00
|
|
|
- or if the event asks for it (cache_stmt == TRUE).
|
2005-01-16 13:16:23 +01:00
|
|
|
*/
|
|
|
|
if (opt_using_transactions && thd)
|
|
|
|
{
|
2005-12-22 06:39:02 +01:00
|
|
|
if (thd->binlog_setup_trx_data())
|
|
|
|
goto err;
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
binlog_trx_data *const trx_data=
|
2007-08-31 08:19:52 +02:00
|
|
|
(binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);
|
2005-12-22 06:39:02 +01:00
|
|
|
IO_CACHE *trans_log= &trx_data->trans_log;
|
2006-10-05 10:46:14 +02:00
|
|
|
my_off_t trans_log_pos= my_b_tell(trans_log);
|
2009-08-27 01:13:03 +02:00
|
|
|
if (event_info->get_cache_stmt() || trans_log_pos != 0 ||
|
|
|
|
stmt_has_updated_trans_table(thd))
|
2006-05-05 19:08:40 +02:00
|
|
|
{
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("info", ("Using trans_log: cache: %d, trans_log_pos: %lu",
|
2006-10-05 10:46:14 +02:00
|
|
|
event_info->get_cache_stmt(),
|
2006-11-27 00:47:38 +01:00
|
|
|
(ulong) trans_log_pos));
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
thd->binlog_start_trans_and_stmt();
|
2005-01-16 13:16:23 +01:00
|
|
|
file= trans_log;
|
2006-05-05 19:08:40 +02:00
|
|
|
}
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
2006-05-05 19:08:40 +02:00
|
|
|
TODO as Mats suggested, for all the cases above where we write to
|
2005-12-22 06:39:02 +01:00
|
|
|
trans_log, it sounds unnecessary to lock LOCK_log. We should rather
|
|
|
|
test first if we want to write to trans_log, and if not, lock
|
2006-05-05 19:08:40 +02:00
|
|
|
LOCK_log.
|
2005-12-22 06:39:02 +01:00
|
|
|
*/
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
2009-11-23 14:09:39 +01:00
|
|
|
|
2006-05-05 19:08:40 +02:00
|
|
|
DBUG_PRINT("info",("event type: %d",event_info->get_type_code()));
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2002-01-30 15:37:47 +01:00
|
|
|
/*
|
|
|
|
No check for auto events flag here - this write method should
|
|
|
|
never be called if auto-events are enabled
|
|
|
|
*/
|
2003-05-25 22:37:32 +02:00
|
|
|
|
|
|
|
/*
|
2005-02-21 13:47:57 +01:00
|
|
|
1. Write first log events which describe the 'run environment'
|
|
|
|
of the SQL command
|
2003-05-25 22:37:32 +02:00
|
|
|
*/
|
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
/*
|
|
|
|
If row-based binlogging, Insert_id, Rand and other kind of "setting
|
|
|
|
context" events are not needed.
|
|
|
|
*/
|
2002-12-05 02:40:33 +01:00
|
|
|
if (thd)
|
2000-12-07 13:08:48 +01:00
|
|
|
{
|
WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement),
and new binlog format called "mixed" (which is statement-based except if only row-based is correct,
in this cset it means if UDF or UUID is used; more cases could be added in later 5.1 release):
SET GLOBAL|SESSION BINLOG_FORMAT=row|statement|mixed|default;
the global default is statement unless cluster is enabled (then it's row) as in 5.1-alpha.
It's not possible to use SET on this variable if a session is currently in row-based mode and has open temporary tables (because CREATE
TEMPORARY TABLE was not binlogged so temp table is not known on slave), or if NDB is enabled (because
NDB does not support such change on-the-fly, though it will later), of if in a stored function (see below).
The added tests test the possibility or impossibility to SET, their effects, and the mixed mode,
including in prepared statements and in stored procedures and functions.
Caveats:
a) The mixed mode will not work for stored functions: in mixed mode, a stored function will
always be binlogged as one call and in a statement-based way (e.g. INSERT VALUES(myfunc()) or SELECT myfunc()).
b) for the same reason, changing the thread's binlog format inside a stored function is
refused with an error message.
c) the same problems apply to triggers; implementing b) for triggers will be done later (will ask
Dmitri).
Additionally, as the binlog format is now changeable by each user for his session, I remove the implication
which was done at startup, where row-based automatically set log-bin-trust-routine-creators to 1
(not possible anymore as a user can now switch to stmt-based and do nasty things again), and automatically
set --innodb-locks-unsafe-for-binlog to 1 (was anyway theoretically incorrect as it disabled
phantom protection).
Plus fixes for compiler warnings.
2006-02-25 22:21:03 +01:00
|
|
|
if (!thd->current_stmt_binlog_row_based)
|
2002-12-05 02:40:33 +01:00
|
|
|
{
|
WL#3146 "less locking in auto_increment":
this is a cleanup patch for our current auto_increment handling:
new names for auto_increment variables in THD, new methods to manipulate them
(see sql_class.h), some move into handler::, causing less backup/restore
work when executing substatements.
This makes the logic hopefully clearer, less work is is needed in
mysql_insert().
By cleaning up, using different variables for different purposes (instead
of one for 3 things...), we fix those bugs, which someone may want to fix
in 5.0 too:
BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
statement-based"
BUG#20341 "stored function inserting into one auto_increment puts bad
data in slave"
BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
(now if a row is updated, LAST_INSERT_ID() will return its id)
and re-fixes:
BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
(already fixed differently by Ramil in 4.1)
Test of documented behaviour of mysql_insert_id() (there was no test).
The behaviour changes introduced are:
- LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
successfully inserted", instead of "the first autogenerated auto_increment
value if any row was successfully inserted", see auto_increment.test.
Same for mysql_insert_id(), see mysql_client_test.c.
- LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
mysql_client_test.c.
- LAST_INSERT_ID() does not change if no autogenerated value was successfully
inserted (it used to then be 0), see auto_increment.test.
- if in INSERT SELECT no autogenerated value was successfully inserted,
mysql_insert_id() now returns the id of the last inserted row (it already
did this for INSERT VALUES), see mysql_client_test.c.
- if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
(it already did this for INSERT VALUES), see mysql_client_test.c.
- NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
influences not only the first row now.
Additionally, when unlocking a table we check that the thread is not keeping
a next_insert_id (as the table is unlocked that id is potentially out-of-date);
forgetting about this next_insert_id is done in a new
handler::ha_release_auto_increment().
Finally we prepare for engines capable of reserving finite-length intervals
of auto_increment values: we store such intervals in THD. The next step
(to be done by the replication team in 5.1) is to read those intervals from
THD and actually store them in the statement-based binary log. NDB
will be a good engine to test that.
2006-07-09 17:52:19 +02:00
|
|
|
if (thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
|
|
|
Intvar_log_event e(thd,(uchar) LAST_INSERT_ID_EVENT,
|
WL#3146 "less locking in auto_increment":
this is a cleanup patch for our current auto_increment handling:
new names for auto_increment variables in THD, new methods to manipulate them
(see sql_class.h), some move into handler::, causing less backup/restore
work when executing substatements.
This makes the logic hopefully clearer, less work is is needed in
mysql_insert().
By cleaning up, using different variables for different purposes (instead
of one for 3 things...), we fix those bugs, which someone may want to fix
in 5.0 too:
BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
statement-based"
BUG#20341 "stored function inserting into one auto_increment puts bad
data in slave"
BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
(now if a row is updated, LAST_INSERT_ID() will return its id)
and re-fixes:
BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
(already fixed differently by Ramil in 4.1)
Test of documented behaviour of mysql_insert_id() (there was no test).
The behaviour changes introduced are:
- LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
successfully inserted", instead of "the first autogenerated auto_increment
value if any row was successfully inserted", see auto_increment.test.
Same for mysql_insert_id(), see mysql_client_test.c.
- LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
mysql_client_test.c.
- LAST_INSERT_ID() does not change if no autogenerated value was successfully
inserted (it used to then be 0), see auto_increment.test.
- if in INSERT SELECT no autogenerated value was successfully inserted,
mysql_insert_id() now returns the id of the last inserted row (it already
did this for INSERT VALUES), see mysql_client_test.c.
- if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
(it already did this for INSERT VALUES), see mysql_client_test.c.
- NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
influences not only the first row now.
Additionally, when unlocking a table we check that the thread is not keeping
a next_insert_id (as the table is unlocked that id is potentially out-of-date);
forgetting about this next_insert_id is done in a new
handler::ha_release_auto_increment().
Finally we prepare for engines capable of reserving finite-length intervals
of auto_increment values: we store such intervals in THD. The next step
(to be done by the replication team in 5.1) is to read those intervals from
THD and actually store them in the statement-based binary log. NDB
will be a good engine to test that.
2006-07-09 17:52:19 +02:00
|
|
|
thd->first_successful_insert_id_in_prev_stmt_for_binlog);
|
2005-12-22 06:39:02 +01:00
|
|
|
if (e.write(file))
|
|
|
|
goto err;
|
|
|
|
}
|
WL#3146 "less locking in auto_increment":
this is a cleanup patch for our current auto_increment handling:
new names for auto_increment variables in THD, new methods to manipulate them
(see sql_class.h), some move into handler::, causing less backup/restore
work when executing substatements.
This makes the logic hopefully clearer, less work is is needed in
mysql_insert().
By cleaning up, using different variables for different purposes (instead
of one for 3 things...), we fix those bugs, which someone may want to fix
in 5.0 too:
BUG#20339 "stored procedure using LAST_INSERT_ID() does not replicate
statement-based"
BUG#20341 "stored function inserting into one auto_increment puts bad
data in slave"
BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE"
(now if a row is updated, LAST_INSERT_ID() will return its id)
and re-fixes:
BUG#6880 "LAST_INSERT_ID() value changes during multi-row INSERT"
(already fixed differently by Ramil in 4.1)
Test of documented behaviour of mysql_insert_id() (there was no test).
The behaviour changes introduced are:
- LAST_INSERT_ID() now returns "the first autogenerated auto_increment value
successfully inserted", instead of "the first autogenerated auto_increment
value if any row was successfully inserted", see auto_increment.test.
Same for mysql_insert_id(), see mysql_client_test.c.
- LAST_INSERT_ID() returns the id of the updated row if ON DUPLICATE KEY
UPDATE, see auto_increment.test. Same for mysql_insert_id(), see
mysql_client_test.c.
- LAST_INSERT_ID() does not change if no autogenerated value was successfully
inserted (it used to then be 0), see auto_increment.test.
- if in INSERT SELECT no autogenerated value was successfully inserted,
mysql_insert_id() now returns the id of the last inserted row (it already
did this for INSERT VALUES), see mysql_client_test.c.
- if INSERT SELECT uses LAST_INSERT_ID(X), mysql_insert_id() now returns X
(it already did this for INSERT VALUES), see mysql_client_test.c.
- NDB now behaves like other engines wrt SET INSERT_ID: with INSERT IGNORE,
the id passed in SET INSERT_ID is re-used until a row succeeds; SET INSERT_ID
influences not only the first row now.
Additionally, when unlocking a table we check that the thread is not keeping
a next_insert_id (as the table is unlocked that id is potentially out-of-date);
forgetting about this next_insert_id is done in a new
handler::ha_release_auto_increment().
Finally we prepare for engines capable of reserving finite-length intervals
of auto_increment values: we store such intervals in THD. The next step
(to be done by the replication team in 5.1) is to read those intervals from
THD and actually store them in the statement-based binary log. NDB
will be a good engine to test that.
2006-07-09 17:52:19 +02:00
|
|
|
if (thd->auto_inc_intervals_in_cur_stmt_for_binlog.nb_elements() > 0)
|
2005-12-22 06:39:02 +01:00
|
|
|
{
|
2006-11-27 00:47:38 +01:00
|
|
|
DBUG_PRINT("info",("number of auto_inc intervals: %u",
|
|
|
|
thd->auto_inc_intervals_in_cur_stmt_for_binlog.
|
|
|
|
nb_elements()));
|
|
|
|
Intvar_log_event e(thd, (uchar) INSERT_ID_EVENT,
|
|
|
|
thd->auto_inc_intervals_in_cur_stmt_for_binlog.
|
|
|
|
minimum());
|
2005-12-22 06:39:02 +01:00
|
|
|
if (e.write(file))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (thd->rand_used)
|
|
|
|
{
|
|
|
|
Rand_log_event e(thd,thd->rand_saved_seed1,thd->rand_saved_seed2);
|
|
|
|
if (e.write(file))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (thd->user_var_events.elements)
|
|
|
|
{
|
|
|
|
for (uint i= 0; i < thd->user_var_events.elements; i++)
|
|
|
|
{
|
|
|
|
BINLOG_USER_VAR_EVENT *user_var_event;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
get_dynamic(&thd->user_var_events,(uchar*) &user_var_event, i);
|
2005-12-22 06:39:02 +01:00
|
|
|
User_var_log_event e(thd, user_var_event->user_var_event->name.str,
|
|
|
|
user_var_event->user_var_event->name.length,
|
|
|
|
user_var_event->value,
|
|
|
|
user_var_event->length,
|
|
|
|
user_var_event->type,
|
|
|
|
user_var_event->charset_number);
|
|
|
|
if (e.write(file))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
2003-01-30 18:39:54 +01:00
|
|
|
}
|
2000-12-07 13:08:48 +01:00
|
|
|
}
|
2003-05-25 22:37:32 +02:00
|
|
|
|
2005-04-05 13:17:49 +02:00
|
|
|
/*
|
|
|
|
Write the SQL command
|
2005-02-14 18:39:33 +01:00
|
|
|
*/
|
2003-05-25 22:37:32 +02:00
|
|
|
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
if (event_info->write(file) ||
|
|
|
|
DBUG_EVALUATE_IF("injecting_fault_writing", 1, 0))
|
2000-12-07 13:08:48 +01:00
|
|
|
goto err;
|
2003-05-25 22:37:32 +02:00
|
|
|
|
2003-05-10 20:52:22 +02:00
|
|
|
if (file == &log_file) // we are writing to the real log (disk)
|
2002-01-30 15:37:47 +01:00
|
|
|
{
|
2009-09-26 06:49:49 +02:00
|
|
|
bool synced= 0;
|
2009-09-29 16:27:12 +02:00
|
|
|
if (flush_and_sync(&synced))
|
2003-05-26 14:08:17 +02:00
|
|
|
goto err;
|
2009-09-26 06:49:49 +02:00
|
|
|
|
|
|
|
if (RUN_HOOK(binlog_storage, after_flush,
|
|
|
|
(thd, log_file_name, file->pos_in_file, synced))) {
|
|
|
|
sql_print_error("Failed to run 'after_flush' hooks");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2005-04-05 13:17:49 +02:00
|
|
|
signal_update();
|
|
|
|
rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED);
|
2002-01-22 21:57:56 +01:00
|
|
|
}
|
2003-05-26 14:08:17 +02:00
|
|
|
error=0;
|
2002-01-22 21:57:56 +01:00
|
|
|
|
2000-12-07 13:08:48 +01:00
|
|
|
err:
|
|
|
|
if (error)
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
set_write_error(thd);
|
2000-12-07 13:08:48 +01:00
|
|
|
}
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2005-12-22 06:39:02 +01:00
|
|
|
if (event_info->flags & LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F)
|
|
|
|
++m_table_map_version;
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
2002-11-07 03:02:37 +01:00
|
|
|
DBUG_RETURN(error);
|
2000-12-07 13:08:48 +01:00
|
|
|
}
|
|
|
|
|
2006-01-19 03:56:06 +01:00
|
|
|
|
|
|
|
int error_log_print(enum loglevel level, const char *format,
|
|
|
|
va_list args)
|
|
|
|
{
|
|
|
|
return logger.error_log_print(level, format, args);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool slow_log_print(THD *thd, const char *query, uint query_length,
|
2007-07-30 10:33:50 +02:00
|
|
|
ulonglong current_utime)
|
2006-01-19 03:56:06 +01:00
|
|
|
{
|
2007-07-30 10:33:50 +02:00
|
|
|
return logger.slow_log_print(thd, query, query_length, current_utime);
|
2006-01-19 03:56:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-10-18 20:45:07 +02:00
|
|
|
bool LOGGER::log_command(THD *thd, enum enum_server_command command)
|
|
|
|
{
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
|
|
Security_context *sctx= thd->security_ctx;
|
|
|
|
#endif
|
|
|
|
/*
|
|
|
|
Log command if we have at least one log event handler enabled and want
|
|
|
|
to log this king of commands
|
|
|
|
*/
|
|
|
|
if (*general_log_handler_list && (what_to_log & (1L << (uint) command)))
|
|
|
|
{
|
|
|
|
if ((thd->options & OPTION_LOG_OFF)
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
|
|
&& (sctx->master_access & SUPER_ACL)
|
|
|
|
#endif
|
|
|
|
)
|
|
|
|
{
|
|
|
|
/* No logging */
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-01-19 03:56:06 +01:00
|
|
|
bool general_log_print(THD *thd, enum enum_server_command command,
|
|
|
|
const char *format, ...)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
uint error= 0;
|
|
|
|
|
2007-10-18 20:45:07 +02:00
|
|
|
/* Print the message to the buffer if we want to log this king of commands */
|
|
|
|
if (! logger.log_command(thd, command))
|
|
|
|
return FALSE;
|
|
|
|
|
2006-01-19 03:56:06 +01:00
|
|
|
va_start(args, format);
|
|
|
|
error= logger.general_log_print(thd, command, format, args);
|
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2007-10-18 20:45:07 +02:00
|
|
|
bool general_log_write(THD *thd, enum enum_server_command command,
|
|
|
|
const char *query, uint query_length)
|
|
|
|
{
|
|
|
|
/* Write the message to the log if we want to log this king of commands */
|
|
|
|
if (logger.log_command(thd, command))
|
|
|
|
return logger.general_log_write(thd, command, query, query_length);
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
void MYSQL_BIN_LOG::rotate_and_purge(uint flags)
|
2005-02-22 00:15:31 +01:00
|
|
|
{
|
2009-12-15 07:48:28 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
bool check_purge= false;
|
|
|
|
#endif
|
2005-03-09 12:29:51 +01:00
|
|
|
if (!(flags & RP_LOCK_LOG_IS_ALREADY_LOCKED))
|
|
|
|
pthread_mutex_lock(&LOCK_log);
|
2005-03-02 10:38:25 +01:00
|
|
|
if ((flags & RP_FORCE_ROTATE) ||
|
|
|
|
(my_b_tell(&log_file) >= (my_off_t) max_size))
|
2005-02-22 00:15:31 +01:00
|
|
|
{
|
2006-05-05 08:45:58 +02:00
|
|
|
new_file_without_locking();
|
2005-02-22 00:15:31 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
2009-12-15 07:48:28 +01:00
|
|
|
check_purge= true;
|
2005-02-22 00:15:31 +01:00
|
|
|
#endif
|
|
|
|
}
|
2005-03-09 12:29:51 +01:00
|
|
|
if (!(flags & RP_LOCK_LOG_IS_ALREADY_LOCKED))
|
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
2009-12-15 07:48:28 +01:00
|
|
|
|
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
/*
|
|
|
|
NOTE: Run purge_logs wo/ holding LOCK_log
|
|
|
|
as it otherwise will deadlock in ndbcluster_binlog_index_purge_file
|
|
|
|
*/
|
|
|
|
if (check_purge && expire_logs_days)
|
|
|
|
{
|
|
|
|
time_t purge_time= my_time(0) - expire_logs_days*24*60*60;
|
|
|
|
if (purge_time >= 0)
|
|
|
|
purge_logs_before_date(purge_time);
|
|
|
|
}
|
|
|
|
#endif
|
2005-02-22 00:15:31 +01:00
|
|
|
}
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
uint MYSQL_BIN_LOG::next_file_id()
|
2001-08-04 13:48:58 +02:00
|
|
|
{
|
|
|
|
uint res;
|
|
|
|
pthread_mutex_lock(&LOCK_log);
|
|
|
|
res = file_id++;
|
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2002-08-08 02:12:02 +02:00
|
|
|
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
/*
|
|
|
|
Write the contents of a cache to the binary log.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
write_cache()
|
|
|
|
cache Cache to write to the binary log
|
|
|
|
lock_log True if the LOCK_log mutex should be aquired, false otherwise
|
|
|
|
sync_log True if the log should be flushed and sync:ed
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
Write the contents of the cache to the binary log. The cache will
|
|
|
|
be reset as a READ_CACHE to be able to read the contents from it.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int MYSQL_BIN_LOG::write_cache(IO_CACHE *cache, bool lock_log, bool sync_log)
|
|
|
|
{
|
|
|
|
Mutex_sentry sentry(lock_log ? &LOCK_log : NULL);
|
|
|
|
|
|
|
|
if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0))
|
|
|
|
return ER_ERROR_ON_WRITE;
|
2007-07-10 18:21:06 +02:00
|
|
|
uint length= my_b_bytes_in_cache(cache), group, carry, hdr_offs;
|
2007-06-25 11:37:10 +02:00
|
|
|
long val;
|
|
|
|
uchar header[LOG_EVENT_HEADER_LEN];
|
|
|
|
|
2007-06-27 08:18:24 +02:00
|
|
|
/*
|
|
|
|
The events in the buffer have incorrect end_log_pos data
|
|
|
|
(relative to beginning of group rather than absolute),
|
|
|
|
so we'll recalculate them in situ so the binlog is always
|
|
|
|
correct, even in the middle of a group. This is possible
|
|
|
|
because we now know the start position of the group (the
|
|
|
|
offset of this cache in the log, if you will); all we need
|
|
|
|
to do is to find all event-headers, and add the position of
|
|
|
|
the group to the end_log_pos of each event. This is pretty
|
|
|
|
straight forward, except that we read the cache in segments,
|
|
|
|
so an event-header might end up on the cache-border and get
|
|
|
|
split.
|
|
|
|
*/
|
|
|
|
|
2007-06-27 09:31:47 +02:00
|
|
|
group= (uint)my_b_tell(&log_file);
|
2007-06-25 11:37:10 +02:00
|
|
|
hdr_offs= carry= 0;
|
|
|
|
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
do
|
|
|
|
{
|
2007-06-27 08:18:24 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
if we only got a partial header in the last iteration,
|
|
|
|
get the other half now and process a full header.
|
|
|
|
*/
|
|
|
|
if (unlikely(carry > 0))
|
2007-06-25 11:37:10 +02:00
|
|
|
{
|
|
|
|
DBUG_ASSERT(carry < LOG_EVENT_HEADER_LEN);
|
|
|
|
|
2007-06-27 08:18:24 +02:00
|
|
|
/* assemble both halves */
|
2007-06-25 11:37:10 +02:00
|
|
|
memcpy(&header[carry], (char *)cache->read_pos, LOG_EVENT_HEADER_LEN - carry);
|
|
|
|
|
2007-06-27 08:18:24 +02:00
|
|
|
/* fix end_log_pos */
|
2007-06-25 11:37:10 +02:00
|
|
|
val= uint4korr(&header[LOG_POS_OFFSET]) + group;
|
|
|
|
int4store(&header[LOG_POS_OFFSET], val);
|
|
|
|
|
2007-06-27 08:18:24 +02:00
|
|
|
/* write the first half of the split header */
|
2007-06-25 11:37:10 +02:00
|
|
|
if (my_b_write(&log_file, header, carry))
|
|
|
|
return ER_ERROR_ON_WRITE;
|
|
|
|
|
2007-06-27 08:18:24 +02:00
|
|
|
/*
|
|
|
|
copy fixed second half of header to cache so the correct
|
|
|
|
version will be written later.
|
|
|
|
*/
|
2007-06-25 11:37:10 +02:00
|
|
|
memcpy((char *)cache->read_pos, &header[carry], LOG_EVENT_HEADER_LEN - carry);
|
|
|
|
|
2007-06-27 08:18:24 +02:00
|
|
|
/* next event header at ... */
|
2007-06-30 03:32:33 +02:00
|
|
|
hdr_offs = uint4korr(&header[EVENT_LEN_OFFSET]) - carry;
|
2007-06-25 11:37:10 +02:00
|
|
|
|
|
|
|
carry= 0;
|
|
|
|
}
|
|
|
|
|
2007-06-27 08:18:24 +02:00
|
|
|
/* if there is anything to write, process it. */
|
|
|
|
|
2007-07-10 18:21:06 +02:00
|
|
|
if (likely(length > 0))
|
2007-06-25 11:37:10 +02:00
|
|
|
{
|
2007-06-27 08:18:24 +02:00
|
|
|
/*
|
2007-06-30 03:32:33 +02:00
|
|
|
process all event-headers in this (partial) cache.
|
|
|
|
if next header is beyond current read-buffer,
|
|
|
|
we'll get it later (though not necessarily in the
|
|
|
|
very next iteration, just "eventually").
|
2007-06-27 08:18:24 +02:00
|
|
|
*/
|
2007-06-25 11:37:10 +02:00
|
|
|
|
2007-07-10 18:21:06 +02:00
|
|
|
while (hdr_offs < length)
|
2007-06-27 08:18:24 +02:00
|
|
|
{
|
2007-06-30 03:32:33 +02:00
|
|
|
/*
|
|
|
|
partial header only? save what we can get, process once
|
|
|
|
we get the rest.
|
|
|
|
*/
|
2007-06-25 11:37:10 +02:00
|
|
|
|
2007-07-10 18:21:06 +02:00
|
|
|
if (hdr_offs + LOG_EVENT_HEADER_LEN > length)
|
2007-06-30 03:32:33 +02:00
|
|
|
{
|
2007-07-10 18:21:06 +02:00
|
|
|
carry= length - hdr_offs;
|
2007-06-30 03:32:33 +02:00
|
|
|
memcpy(header, (char *)cache->read_pos + hdr_offs, carry);
|
2007-07-10 18:21:06 +02:00
|
|
|
length= hdr_offs;
|
2007-06-30 03:32:33 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* we've got a full event-header, and it came in one piece */
|
2007-06-27 08:18:24 +02:00
|
|
|
|
2007-06-30 03:32:33 +02:00
|
|
|
uchar *log_pos= (uchar *)cache->read_pos + hdr_offs + LOG_POS_OFFSET;
|
2007-06-27 08:18:24 +02:00
|
|
|
|
2007-06-30 03:32:33 +02:00
|
|
|
/* fix end_log_pos */
|
|
|
|
val= uint4korr(log_pos) + group;
|
|
|
|
int4store(log_pos, val);
|
2007-06-27 08:18:24 +02:00
|
|
|
|
2007-06-30 03:32:33 +02:00
|
|
|
/* next event header at ... */
|
|
|
|
log_pos= (uchar *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET;
|
|
|
|
hdr_offs += uint4korr(log_pos);
|
2007-06-25 11:37:10 +02:00
|
|
|
|
2007-06-30 03:32:33 +02:00
|
|
|
}
|
2007-06-27 08:18:24 +02:00
|
|
|
}
|
2007-06-30 03:32:33 +02:00
|
|
|
|
|
|
|
/*
|
2007-07-10 18:21:06 +02:00
|
|
|
Adjust hdr_offs. Note that it may still point beyond the segment
|
|
|
|
read in the next iteration; if the current event is very long,
|
|
|
|
it may take a couple of read-iterations (and subsequent adjustments
|
|
|
|
of hdr_offs) for it to point into the then-current segment.
|
|
|
|
If we have a split header (!carry), hdr_offs will be set at the
|
|
|
|
beginning of the next iteration, overwriting the value we set here:
|
2007-06-30 03:32:33 +02:00
|
|
|
*/
|
2007-07-10 18:21:06 +02:00
|
|
|
hdr_offs -= length;
|
2007-06-25 11:37:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Write data to the binary log file */
|
2007-07-10 18:21:06 +02:00
|
|
|
if (my_b_write(&log_file, cache->read_pos, length))
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
return ER_ERROR_ON_WRITE;
|
2007-06-27 08:18:24 +02:00
|
|
|
cache->read_pos=cache->read_end; // Mark buffer used up
|
2007-07-10 18:21:06 +02:00
|
|
|
} while ((length= my_b_fill(cache)));
|
2007-06-25 18:41:17 +02:00
|
|
|
|
2007-07-10 18:21:06 +02:00
|
|
|
DBUG_ASSERT(carry == 0);
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
|
|
|
|
if (sync_log)
|
2009-09-29 16:27:12 +02:00
|
|
|
return flush_and_sync(0);
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
|
|
|
|
return 0; // All OK
|
|
|
|
}
|
|
|
|
|
2009-05-30 15:32:28 +02:00
|
|
|
/*
|
|
|
|
Helper function to get the error code of the query to be binlogged.
|
|
|
|
*/
|
|
|
|
int query_error_code(THD *thd, bool not_killed)
|
|
|
|
{
|
|
|
|
int error;
|
|
|
|
|
|
|
|
if (not_killed)
|
|
|
|
{
|
2009-09-10 11:18:29 +02:00
|
|
|
error= thd->is_error() ? thd->stmt_da->sql_errno() : 0;
|
2009-05-30 15:32:28 +02:00
|
|
|
|
2009-09-10 11:18:29 +02:00
|
|
|
/* thd->stmt_da->sql_errno() might be ER_SERVER_SHUTDOWN or
|
2009-05-30 15:32:28 +02:00
|
|
|
ER_QUERY_INTERRUPTED, So here we need to make sure that error
|
|
|
|
is not set to these errors when specified not_killed by the
|
|
|
|
caller.
|
|
|
|
*/
|
|
|
|
if (error == ER_SERVER_SHUTDOWN || error == ER_QUERY_INTERRUPTED)
|
|
|
|
error= 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* killed status for DELAYED INSERT thread should never be used */
|
|
|
|
DBUG_ASSERT(!(thd->system_thread & SYSTEM_THREAD_DELAYED_INSERT));
|
|
|
|
error= thd->killed_errno();
|
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
bool MYSQL_BIN_LOG::write_incident(THD *thd, bool lock)
|
|
|
|
{
|
|
|
|
uint error= 0;
|
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::write_incident");
|
|
|
|
LEX_STRING const write_error_msg=
|
|
|
|
{ C_STRING_WITH_LEN("error writing to the binary log") };
|
|
|
|
Incident incident= INCIDENT_LOST_EVENTS;
|
|
|
|
Incident_log_event ev(thd, incident, write_error_msg);
|
|
|
|
if (lock)
|
|
|
|
pthread_mutex_lock(&LOCK_log);
|
|
|
|
ev.write(&log_file);
|
|
|
|
if (lock)
|
|
|
|
{
|
2009-09-26 06:49:49 +02:00
|
|
|
if (!error && !(error= flush_and_sync(0)))
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
{
|
|
|
|
signal_update();
|
|
|
|
rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED);
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
|
|
|
}
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Write a cached log entry to the binary log.
|
|
|
|
- To support transaction over replication, we wrap the transaction
|
|
|
|
with BEGIN/COMMIT or BEGIN/ROLLBACK in the binary log.
|
|
|
|
We want to write a BEGIN/ROLLBACK block when a non-transactional table
|
|
|
|
was updated in a transaction which was rolled back. This is to ensure
|
|
|
|
that the same updates are run on the slave.
|
|
|
|
|
|
|
|
@param thd
|
|
|
|
@param cache The cache to copy to the binlog
|
|
|
|
@param commit_event The commit event to print after writing the
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
contents of the cache.
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
@param incident Defines if an incident event should be created to
|
|
|
|
notify that some non-transactional changes did
|
|
|
|
not get into the binlog.
|
2 minor edits, plus
fix for BUG#1113 "INSERT into non-trans table SELECT ; ROLLBACK" does not send warning"
and
fix for BUG#873 "In transaction, INSERT to non-trans table is written too early to binlog".
Now we don't always write the non-trans update immediately to the binlog;
if there is something in the binlog cache we write it to the binlog cache
(because the non-trans update could depend on a trans table which was modified
earlier in the transaction); then in case of ROLLBACK, we write the binlog
cache to the binlog, wrapped with BEGIN/ROLLBACK.
This guarantees that the slave does the same updates.
For ROLLBACK TO SAVEPOINT: when we execute a SAVEPOINT command we write it
to the binlog cache. At ROLLBACK TO SAVEPOINT, if some non-trans table was updated,
we write ROLLBACK TO SAVEPOINT to the binlog cache; when the transaction
terminates (COMMIT/ROLLBACK), the binlog cache will be flushed to the binlog
(because of the non-trans update) so we'll have SAVEPOINT and ROLLBACK TO
SAVEPOINT in the binlog.
Apart from this rare case of updates of mixed table types in transaction, the
usual way is still clear the binlog cache at ROLLBACK, or chop it at
ROLLBACK TO SAVEPOINT (meaning the SAVEPOINT command is also chopped, which
is fine).
Note that BUG#873 encompasses subbugs 1) and 2) of BUG#333 "3 binlogging bugs when doing INSERT with mixed InnoDB/MyISAM".
2003-08-22 15:39:24 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
|
|
|
We only come here if there is something in the cache.
|
|
|
|
@note
|
|
|
|
The thing in the cache is always a complete transaction.
|
|
|
|
@note
|
|
|
|
'cache' needs to be reinitialized after this functions returns.
|
2000-12-07 13:08:48 +01:00
|
|
|
*/
|
|
|
|
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
bool MYSQL_BIN_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event,
|
|
|
|
bool incident)
|
2000-12-07 13:08:48 +01:00
|
|
|
{
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::write(THD *, IO_CACHE *, Log_event *)");
|
2009-11-24 14:54:59 +01:00
|
|
|
pthread_mutex_lock(&LOCK_log);
|
2005-02-22 00:15:31 +01:00
|
|
|
|
2006-06-12 14:54:45 +02:00
|
|
|
/* NULL would represent nothing to replicate after ROLLBACK */
|
|
|
|
DBUG_ASSERT(commit_event != NULL);
|
|
|
|
|
2007-07-30 18:02:21 +02:00
|
|
|
DBUG_ASSERT(is_open());
|
2005-01-16 13:16:23 +01:00
|
|
|
if (likely(is_open())) // Should always be true
|
2000-12-07 13:08:48 +01:00
|
|
|
{
|
2002-06-05 22:04:38 +02:00
|
|
|
/*
|
2006-10-05 10:46:14 +02:00
|
|
|
We only bother to write to the binary log if there is anything
|
|
|
|
to write.
|
|
|
|
*/
|
|
|
|
if (my_b_tell(cache) > 0)
|
2002-08-08 02:12:02 +02:00
|
|
|
{
|
2004-11-10 15:07:55 +01:00
|
|
|
/*
|
2007-12-14 14:40:45 +01:00
|
|
|
Log "BEGIN" at the beginning of every transaction. Here, a
|
|
|
|
transaction is either a BEGIN..COMMIT block or a single
|
|
|
|
statement in autocommit mode.
|
2004-11-10 15:07:55 +01:00
|
|
|
*/
|
2009-05-31 11:15:35 +02:00
|
|
|
Query_log_event qinfo(thd, STRING_WITH_LEN("BEGIN"), TRUE, TRUE, 0);
|
2009-05-30 15:32:28 +02:00
|
|
|
|
2007-12-14 14:40:45 +01:00
|
|
|
/*
|
|
|
|
Now this Query_log_event has artificial log_pos 0. It must be
|
|
|
|
adjusted to reflect the real position in the log. Not doing it
|
|
|
|
would confuse the slave: it would prevent this one from
|
|
|
|
knowing where he is in the master's binlog, which would result
|
|
|
|
in wrong positions being shown to the user, MASTER_POS_WAIT
|
|
|
|
undue waiting etc.
|
|
|
|
*/
|
|
|
|
if (qinfo.write(&log_file))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
DBUG_EXECUTE_IF("crash_before_writing_xid",
|
|
|
|
{
|
|
|
|
if ((write_error= write_cache(cache, false, true)))
|
|
|
|
DBUG_PRINT("info", ("error writing binlog cache: %d",
|
|
|
|
write_error));
|
|
|
|
DBUG_PRINT("info", ("crashing before writing xid"));
|
|
|
|
abort();
|
|
|
|
});
|
2002-08-08 02:12:02 +02:00
|
|
|
|
BUG#22864 (Rollback following CREATE... SELECT discards 'CREATE TABLE'
from log):
When row-based logging is used, the CREATE-SELECT is written as two
parts: as a CREATE TABLE statement and as the rows for the table. For
both transactional and non-transactional tables, the CREATE TABLE
statement was written to the transaction cache, as were the rows, and
on statement end, the entire transaction cache was written to the binary
log if the table was non-transactional. For transactional tables, the
events were kept in the transaction cache until end of transaction (or
statement that were not part of a transaction).
For the case when AUTOCOMMIT=0 and we are creating a transactional table
using a create select, we would then keep the CREATE TABLE statement and
the rows for the CREATE-SELECT, while executing the following statements.
On a rollback, the transaction cache would then be cleared, which would
also remove the CREATE TABLE statement. Hence no table would be created
on the slave, while there is an empty table on the master.
This relates to BUG#22865 where the table being created exists on the
master, but not on the slave during insertion of rows into the newly
created table. This occurs since the CREATE TABLE statement were still
in the transaction cache until the statement finished executing, and
possibly longer if the table was transactional.
This patch changes the behaviour of the CREATE-SELECT statement by
adding an implicit commit at the end of the statement when creating
non-temporary tables. Hence, non-temporary tables will be written to the
binary log on completion, and in the even of AUTOCOMMIT=0, a new
transaction will be started. Temporary tables do not commit an ongoing
transaction: neither as a pre- not a post-commit.
The events for both transactional and non-transactional tables are
saved in the transaction cache, and written to the binary log at end
of the statement.
2006-12-21 09:29:02 +01:00
|
|
|
if ((write_error= write_cache(cache, false, false)))
|
|
|
|
goto err;
|
2007-06-25 11:37:10 +02:00
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
if (commit_event && commit_event->write(&log_file))
|
|
|
|
goto err;
|
BUG#43929 binlog corruption when max_binlog_cache_size is exceeded
Large transactions and statements may corrupt the binary log if the size of the
cache, which is set by the max_binlog_cache_size, is not enough to store the
the changes.
In a nutshell, to fix the bug, we save the position of the next character in the
cache before starting processing a statement. If there is a problem, we simply
restore the position thus removing any effect of the statement from the cache.
Unfortunately, to avoid corrupting the binary log, we may end up loosing changes
on non-transactional tables if they do not fit in the cache. In such cases, we
store an Incident_log_event in order to stop the slave and alert users that some
changes were not logged.
Precisely, for every non-transactional changes that do not fit into the cache,
we do the following:
a) the statement is *not* logged
b) an incident event is logged after committing/rolling back the transaction,
if any. Note that if a failure happens before writing the incident event to
the binary log, the slave will not stop and the master will not have reported
any error.
c) its respective statement gives an error
For transactional changes that do not fit into the cache, we do the following:
a) the statement is *not* logged
b) its respective statement gives an error
To work properly, this patch requires two additional things. Firstly, callers to
MYSQL_BIN_LOG::write and THD::binlog_query must handle any error returned and
take the appropriate actions such as undoing the effects of a statement. We
already changed some calls in the sql_insert.cc, sql_update.cc and sql_insert.cc
modules but the remaining calls spread all over the code should be handled in
BUG#37148. Secondly, statements must be either classified as DDL or DML because
DDLs that do not get into the cache must generate an incident event since they
cannot be rolled back.
2009-06-18 15:52:46 +02:00
|
|
|
|
|
|
|
if (incident && write_incident(thd, FALSE))
|
|
|
|
goto err;
|
|
|
|
|
2009-09-26 06:49:49 +02:00
|
|
|
bool synced= 0;
|
2009-09-29 16:27:12 +02:00
|
|
|
if (flush_and_sync(&synced))
|
2006-10-05 10:46:14 +02:00
|
|
|
goto err;
|
|
|
|
DBUG_EXECUTE_IF("half_binlogged_transaction", abort(););
|
|
|
|
if (cache->error) // Error on read
|
|
|
|
{
|
|
|
|
sql_print_error(ER(ER_ERROR_ON_READ), cache->file_name, errno);
|
|
|
|
write_error=1; // Don't give more errors
|
|
|
|
goto err;
|
|
|
|
}
|
2009-09-26 06:49:49 +02:00
|
|
|
|
|
|
|
if (RUN_HOOK(binlog_storage, after_flush,
|
|
|
|
(thd, log_file_name, log_file.pos_in_file, synced)))
|
|
|
|
{
|
|
|
|
sql_print_error("Failed to run 'after_flush' hooks");
|
|
|
|
write_error=1;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2006-10-05 10:46:14 +02:00
|
|
|
signal_update();
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2006-10-05 10:46:14 +02:00
|
|
|
|
2005-03-02 10:38:25 +01:00
|
|
|
/*
|
|
|
|
if commit_event is Xid_log_event, increase the number of
|
|
|
|
prepared_xids (it's decreasd in ::unlog()). Binlog cannot be rotated
|
|
|
|
if there're prepared xids in it - see the comment in new_file() for
|
|
|
|
an explanation.
|
|
|
|
If the commit_event is not Xid_log_event (then it's a Query_log_event)
|
|
|
|
rotate binlog, if necessary.
|
|
|
|
*/
|
2006-10-05 10:46:14 +02:00
|
|
|
if (commit_event && commit_event->get_type_code() == XID_EVENT)
|
2006-03-31 11:48:08 +02:00
|
|
|
{
|
|
|
|
pthread_mutex_lock(&LOCK_prep_xids);
|
|
|
|
prepared_xids++;
|
|
|
|
pthread_mutex_unlock(&LOCK_prep_xids);
|
|
|
|
}
|
2005-03-02 10:38:25 +01:00
|
|
|
else
|
|
|
|
rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2009-11-24 14:54:59 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
2003-05-03 01:29:40 +02:00
|
|
|
|
2005-03-02 10:38:25 +01:00
|
|
|
DBUG_RETURN(0);
|
2000-12-07 13:08:48 +01:00
|
|
|
|
|
|
|
err:
|
2002-08-08 02:12:02 +02:00
|
|
|
if (!write_error)
|
|
|
|
{
|
|
|
|
write_error= 1;
|
|
|
|
sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno);
|
|
|
|
}
|
2009-11-24 14:54:59 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
2002-11-07 03:02:37 +01:00
|
|
|
DBUG_RETURN(1);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2000-12-07 13:08:48 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2009-09-29 13:16:23 +02:00
|
|
|
Wait until we get a signal that the relay log has been updated.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param thd Thread variable
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
2002-08-08 02:12:02 +02:00
|
|
|
One must have a lock on LOCK_log before calling this function.
|
2005-04-05 13:17:49 +02:00
|
|
|
This lock will be released before return! That's required by
|
2004-07-31 22:33:20 +02:00
|
|
|
THD::enter_cond() (see NOTES in sql_class.h).
|
2002-08-08 02:12:02 +02:00
|
|
|
*/
|
|
|
|
|
2009-09-29 13:16:23 +02:00
|
|
|
void MYSQL_BIN_LOG::wait_for_update_relay_log(THD* thd)
|
2002-01-20 03:16:52 +01:00
|
|
|
{
|
2004-11-10 17:07:39 +01:00
|
|
|
const char *old_msg;
|
2009-09-29 13:16:23 +02:00
|
|
|
DBUG_ENTER("wait_for_update_relay_log");
|
2005-10-03 18:34:42 +02:00
|
|
|
|
2004-11-10 17:07:39 +01:00
|
|
|
old_msg= thd->enter_cond(&update_cond, &LOCK_log,
|
2009-09-29 13:16:23 +02:00
|
|
|
"Slave has read all relay log; "
|
|
|
|
"waiting for the slave I/O "
|
|
|
|
"thread to update it" );
|
2002-01-20 03:16:52 +01:00
|
|
|
pthread_cond_wait(&update_cond, &LOCK_log);
|
|
|
|
thd->exit_cond(old_msg);
|
2004-11-10 17:07:39 +01:00
|
|
|
DBUG_VOID_RETURN;
|
2002-08-22 15:50:58 +02:00
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2009-09-29 13:16:23 +02:00
|
|
|
/**
|
|
|
|
Wait until we get a signal that the binary log has been updated.
|
|
|
|
Applies to master only.
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
@param[in] thd a THD struct
|
|
|
|
@param[in] timeout a pointer to a timespec;
|
|
|
|
NULL means to wait w/o timeout.
|
|
|
|
@retval 0 if got signalled on update
|
|
|
|
@retval non-0 if wait timeout elapsed
|
|
|
|
@note
|
|
|
|
LOCK_log must be taken before calling this function.
|
|
|
|
LOCK_log is being released while the thread is waiting.
|
|
|
|
LOCK_log is released by the caller.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int MYSQL_BIN_LOG::wait_for_update_bin_log(THD* thd,
|
|
|
|
const struct timespec *timeout)
|
|
|
|
{
|
|
|
|
int ret= 0;
|
|
|
|
const char* old_msg = thd->proc_info;
|
|
|
|
DBUG_ENTER("wait_for_update_bin_log");
|
|
|
|
old_msg= thd->enter_cond(&update_cond, &LOCK_log,
|
|
|
|
"Master has sent all binlog to slave; "
|
|
|
|
"waiting for binlog to be updated");
|
|
|
|
if (!timeout)
|
|
|
|
pthread_cond_wait(&update_cond, &LOCK_log);
|
|
|
|
else
|
|
|
|
ret= pthread_cond_timedwait(&update_cond, &LOCK_log,
|
|
|
|
const_cast<struct timespec *>(timeout));
|
|
|
|
DBUG_RETURN(ret);
|
|
|
|
}
|
|
|
|
|
2002-06-05 22:04:38 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Close the log file.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param exiting Bitmask for one or more of the following bits:
|
|
|
|
- LOG_CLOSE_INDEX : if we should close the index file
|
|
|
|
- LOG_CLOSE_TO_BE_OPENED : if we intend to call open
|
|
|
|
at once after close.
|
|
|
|
- LOG_CLOSE_STOP_EVENT : write a 'stop' event to the log
|
2003-01-28 07:38:28 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
2003-01-28 07:38:28 +01:00
|
|
|
One can do an open on the object at once after doing a close.
|
|
|
|
The internal structures are not freed until cleanup() is called
|
2002-08-08 02:12:02 +02:00
|
|
|
*/
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
void MYSQL_BIN_LOG::close(uint exiting)
|
2000-07-31 21:29:14 +02:00
|
|
|
{ // One can't set log_type here!
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::close");
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_PRINT("enter",("exiting: %d", (int) exiting));
|
2006-06-05 03:34:34 +02:00
|
|
|
if (log_state == LOG_OPENED)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2003-01-15 09:11:44 +01:00
|
|
|
#ifdef HAVE_REPLICATION
|
2003-07-14 13:59:26 +02:00
|
|
|
if (log_type == LOG_BIN && !no_auto_events &&
|
|
|
|
(exiting & LOG_CLOSE_STOP_EVENT))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
Stop_log_event s;
|
2000-11-15 22:00:06 +01:00
|
|
|
s.write(&log_file);
|
2004-11-12 04:01:46 +01:00
|
|
|
bytes_written+= s.data_written;
|
2002-01-20 03:16:52 +01:00
|
|
|
signal_update();
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2003-01-15 09:11:44 +01:00
|
|
|
#endif /* HAVE_REPLICATION */
|
2005-01-16 13:16:23 +01:00
|
|
|
|
|
|
|
/* don't pwrite in a file opened with O_APPEND - it doesn't work */
|
2005-02-09 20:04:28 +01:00
|
|
|
if (log_file.type == WRITE_CACHE && log_type == LOG_BIN)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
my_off_t offset= BIN_LOG_HEADER_SIZE + FLAGS_OFFSET;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_off_t org_position= my_tell(log_file.file, MYF(0));
|
|
|
|
uchar flags= 0; // clearing LOG_EVENT_BINLOG_IN_USE_F
|
2005-01-27 22:38:56 +01:00
|
|
|
my_pwrite(log_file.file, &flags, 1, offset, MYF(0));
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
/*
|
|
|
|
Restore position so that anything we have in the IO_cache is written
|
|
|
|
to the correct position.
|
|
|
|
We need the seek here, as my_pwrite() is not guaranteed to keep the
|
|
|
|
original position on system that doesn't support pwrite().
|
|
|
|
*/
|
|
|
|
my_seek(log_file.file, org_position, MY_SEEK_SET, MYF(0));
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
/* this will cleanup IO_CACHE, sync and close the file */
|
|
|
|
MYSQL_LOG::close(exiting);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2002-08-08 02:12:02 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
The following test is needed even if is_open() is not set, as we may have
|
|
|
|
called a not complete close earlier and the index file is still open.
|
|
|
|
*/
|
|
|
|
|
2003-07-14 13:59:26 +02:00
|
|
|
if ((exiting & LOG_CLOSE_INDEX) && my_b_inited(&index_file))
|
2000-09-16 03:27:21 +02:00
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
end_io_cache(&index_file);
|
|
|
|
if (my_close(index_file.file, MYF(0)) < 0 && ! write_error)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2002-08-08 02:12:02 +02:00
|
|
|
write_error= 1;
|
|
|
|
sql_print_error(ER(ER_ERROR_ON_WRITE), index_file_name, errno);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2000-09-16 03:27:21 +02:00
|
|
|
}
|
2006-06-05 03:34:34 +02:00
|
|
|
log_state= (exiting & LOG_CLOSE_TO_BE_OPENED) ? LOG_TO_BE_OPENED : LOG_CLOSED;
|
2000-11-15 22:00:06 +01:00
|
|
|
safeFree(name);
|
2002-08-08 02:12:02 +02:00
|
|
|
DBUG_VOID_RETURN;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
void MYSQL_BIN_LOG::set_max_size(ulong max_size_arg)
|
2003-07-06 17:59:54 +02:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
We need to take locks, otherwise this may happen:
|
|
|
|
new_file() is called, calls open(old_max_size), then before open() starts,
|
|
|
|
set_max_size() sets max_size to max_size_arg, then open() starts and
|
|
|
|
uses the old_max_size argument, so max_size_arg has been overwritten and
|
|
|
|
it's like if the SET command was never run.
|
|
|
|
*/
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::set_max_size");
|
2003-07-11 14:26:44 +02:00
|
|
|
pthread_mutex_lock(&LOCK_log);
|
2003-07-06 17:59:54 +02:00
|
|
|
if (is_open())
|
|
|
|
max_size= max_size_arg;
|
2003-07-11 14:26:44 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_log);
|
|
|
|
DBUG_VOID_RETURN;
|
2003-07-06 17:59:54 +02:00
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2003-07-14 09:12:05 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Check if a string is a valid number.
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param str String to test
|
|
|
|
@param res Store value here
|
|
|
|
@param allow_wildcards Set to 1 if we should ignore '%' and '_'
|
2002-08-08 02:12:02 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
2002-08-08 02:12:02 +02:00
|
|
|
For the moment the allow_wildcards argument is not used
|
|
|
|
Should be move to some other file.
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2002-08-08 02:12:02 +02:00
|
|
|
1 String is a number
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
2009-11-22 04:59:48 +01:00
|
|
|
0 String is not a number
|
2002-06-11 10:20:31 +02:00
|
|
|
*/
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
static bool test_if_number(register const char *str,
|
2009-11-22 04:59:48 +01:00
|
|
|
ulong *res, bool allow_wildcards)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
reg2 int flag;
|
|
|
|
const char *start;
|
|
|
|
DBUG_ENTER("test_if_number");
|
|
|
|
|
|
|
|
flag=0; start=str;
|
|
|
|
while (*str++ == ' ') ;
|
|
|
|
if (*--str == '-' || *str == '+')
|
|
|
|
str++;
|
2003-02-07 14:47:24 +01:00
|
|
|
while (my_isdigit(files_charset_info,*str) ||
|
|
|
|
(allow_wildcards && (*str == wild_many || *str == wild_one)))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
flag=1;
|
|
|
|
str++;
|
|
|
|
}
|
|
|
|
if (*str == '.')
|
|
|
|
{
|
|
|
|
for (str++ ;
|
2002-12-19 06:38:31 +01:00
|
|
|
my_isdigit(files_charset_info,*str) ||
|
2000-07-31 21:29:14 +02:00
|
|
|
(allow_wildcards && (*str == wild_many || *str == wild_one)) ;
|
|
|
|
str++, flag=1) ;
|
|
|
|
}
|
|
|
|
if (*str != 0 || flag == 0)
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
if (res)
|
|
|
|
*res=atol(start);
|
|
|
|
DBUG_RETURN(1); /* Number ok */
|
|
|
|
} /* test_if_number */
|
|
|
|
|
|
|
|
|
|
|
|
void sql_perror(const char *message)
|
|
|
|
{
|
|
|
|
#ifdef HAVE_STRERROR
|
|
|
|
sql_print_error("%s: %s",message, strerror(errno));
|
|
|
|
#else
|
|
|
|
perror(message);
|
|
|
|
#endif
|
|
|
|
}
|
2002-12-16 14:33:29 +01:00
|
|
|
|
2004-08-27 23:49:54 +02:00
|
|
|
|
2003-01-27 18:37:25 +01:00
|
|
|
bool flush_error_log()
|
|
|
|
{
|
|
|
|
bool result=0;
|
2003-01-28 19:56:35 +01:00
|
|
|
if (opt_error_log)
|
2003-01-27 18:37:25 +01:00
|
|
|
{
|
|
|
|
char err_renamed[FN_REFLEN], *end;
|
|
|
|
end= strmake(err_renamed,log_error_file,FN_REFLEN-4);
|
|
|
|
strmov(end, "-old");
|
2009-11-24 14:54:59 +01:00
|
|
|
pthread_mutex_lock(&LOCK_error_log);
|
2003-01-27 18:37:25 +01:00
|
|
|
#ifdef __WIN__
|
|
|
|
char err_temp[FN_REFLEN+4];
|
|
|
|
/*
|
|
|
|
On Windows is necessary a temporary file for to rename
|
|
|
|
the current error file.
|
|
|
|
*/
|
2005-07-28 15:10:14 +02:00
|
|
|
strxmov(err_temp, err_renamed,"-tmp",NullS);
|
2003-01-27 18:37:25 +01:00
|
|
|
(void) my_delete(err_temp, MYF(0));
|
|
|
|
if (freopen(err_temp,"a+",stdout))
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
int fd;
|
|
|
|
size_t bytes;
|
|
|
|
uchar buf[IO_SIZE];
|
|
|
|
|
2003-01-27 18:37:25 +01:00
|
|
|
freopen(err_temp,"a+",stderr);
|
2009-03-05 10:48:03 +01:00
|
|
|
setbuf(stderr, NULL);
|
2003-01-27 18:37:25 +01:00
|
|
|
(void) my_delete(err_renamed, MYF(0));
|
|
|
|
my_rename(log_error_file,err_renamed,MYF(0));
|
|
|
|
if (freopen(log_error_file,"a+",stdout))
|
2009-03-05 10:48:03 +01:00
|
|
|
{
|
2003-01-27 18:37:25 +01:00
|
|
|
freopen(log_error_file,"a+",stderr);
|
2009-03-05 10:48:03 +01:00
|
|
|
setbuf(stderr, NULL);
|
|
|
|
}
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
|
2003-01-27 18:37:25 +01:00
|
|
|
if ((fd = my_open(err_temp, O_RDONLY, MYF(0))) >= 0)
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
while ((bytes= my_read(fd, buf, IO_SIZE, MYF(0))) &&
|
|
|
|
bytes != MY_FILE_ERROR)
|
|
|
|
my_fwrite(stderr, buf, bytes, MYF(0));
|
2003-01-27 18:37:25 +01:00
|
|
|
my_close(fd, MYF(0));
|
|
|
|
}
|
|
|
|
(void) my_delete(err_temp, MYF(0));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
result= 1;
|
|
|
|
#else
|
|
|
|
my_rename(log_error_file,err_renamed,MYF(0));
|
|
|
|
if (freopen(log_error_file,"a+",stdout))
|
2009-03-05 10:48:03 +01:00
|
|
|
{
|
2009-08-28 18:21:54 +02:00
|
|
|
FILE *reopen;
|
|
|
|
reopen= freopen(log_error_file,"a+",stderr);
|
2009-03-05 10:48:03 +01:00
|
|
|
setbuf(stderr, NULL);
|
|
|
|
}
|
2003-01-27 18:37:25 +01:00
|
|
|
else
|
|
|
|
result= 1;
|
|
|
|
#endif
|
2009-11-24 14:54:59 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_error_log);
|
2003-01-27 18:37:25 +01:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
2003-02-04 20:52:14 +01:00
|
|
|
|
2006-05-05 08:45:58 +02:00
|
|
|
void MYSQL_BIN_LOG::signal_update()
|
2004-11-10 17:07:39 +01:00
|
|
|
{
|
2006-05-05 08:45:58 +02:00
|
|
|
DBUG_ENTER("MYSQL_BIN_LOG::signal_update");
|
2009-09-29 13:16:23 +02:00
|
|
|
signal_cnt++;
|
2004-11-10 17:07:39 +01:00
|
|
|
pthread_cond_broadcast(&update_cond);
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
2009-09-30 22:10:22 +02:00
|
|
|
#ifdef _WIN32
|
2007-03-28 10:12:33 +02:00
|
|
|
static void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
|
2007-03-29 03:49:30 +02:00
|
|
|
size_t length, size_t buffLen)
|
2004-08-18 22:31:01 +02:00
|
|
|
{
|
|
|
|
HANDLE event;
|
2007-03-28 10:12:33 +02:00
|
|
|
char *buffptr= buff;
|
2004-08-26 15:19:46 +02:00
|
|
|
DBUG_ENTER("print_buffer_to_nt_eventlog");
|
2004-08-19 17:56:32 +02:00
|
|
|
|
2007-03-28 10:12:33 +02:00
|
|
|
/* Add ending CR/LF's to string, overwrite last chars if necessary */
|
|
|
|
strmov(buffptr+min(length, buffLen-5), "\r\n\r\n");
|
2004-08-18 22:31:01 +02:00
|
|
|
|
2004-08-27 23:49:54 +02:00
|
|
|
setup_windows_event_source();
|
|
|
|
if ((event= RegisterEventSource(NULL,"MySQL")))
|
2004-08-18 22:31:01 +02:00
|
|
|
{
|
2004-08-27 23:49:54 +02:00
|
|
|
switch (level) {
|
2004-08-18 22:31:01 +02:00
|
|
|
case ERROR_LEVEL:
|
2004-08-27 23:49:54 +02:00
|
|
|
ReportEvent(event, EVENTLOG_ERROR_TYPE, 0, MSG_DEFAULT, NULL, 1, 0,
|
2007-03-28 10:12:33 +02:00
|
|
|
(LPCSTR*)&buffptr, NULL);
|
2004-08-18 22:31:01 +02:00
|
|
|
break;
|
|
|
|
case WARNING_LEVEL:
|
2004-08-27 23:49:54 +02:00
|
|
|
ReportEvent(event, EVENTLOG_WARNING_TYPE, 0, MSG_DEFAULT, NULL, 1, 0,
|
2007-03-28 10:12:33 +02:00
|
|
|
(LPCSTR*) &buffptr, NULL);
|
2004-08-18 22:31:01 +02:00
|
|
|
break;
|
|
|
|
case INFORMATION_LEVEL:
|
2004-08-27 23:49:54 +02:00
|
|
|
ReportEvent(event, EVENTLOG_INFORMATION_TYPE, 0, MSG_DEFAULT, NULL, 1,
|
2007-03-28 10:12:33 +02:00
|
|
|
0, (LPCSTR*) &buffptr, NULL);
|
2004-08-18 22:31:01 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
DeregisterEventSource(event);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
2009-09-30 22:10:22 +02:00
|
|
|
#endif /* _WIN32 */
|
2004-08-27 23:49:54 +02:00
|
|
|
|
2004-08-18 22:31:01 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2004-08-27 23:49:54 +02:00
|
|
|
Prints a printf style message to the error log and, under NT, to the
|
|
|
|
Windows event log.
|
2004-08-18 22:31:01 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
This function prints the message into a buffer and then sends that buffer
|
|
|
|
to other functions to write that message to other logging sources.
|
2004-08-18 22:31:01 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@param event_type Type of event to write (Error, Warning, or Info)
|
|
|
|
@param format Printf style format of message
|
|
|
|
@param args va_list list of arguments for the message
|
2004-08-18 22:31:01 +02:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@returns
|
2006-01-19 03:56:06 +01:00
|
|
|
The function always returns 0. The return value is present in the
|
|
|
|
signature to be compatible with other logging routines, which could
|
|
|
|
return an error (e.g. logging to the log tables)
|
2004-08-14 03:38:37 +02:00
|
|
|
*/
|
2004-08-27 23:49:54 +02:00
|
|
|
|
2008-02-27 09:42:43 +01:00
|
|
|
#ifndef EMBEDDED_LIBRARY
|
2007-03-29 01:50:06 +02:00
|
|
|
static void print_buffer_to_file(enum loglevel level, const char *buffer)
|
|
|
|
{
|
|
|
|
time_t skr;
|
|
|
|
struct tm tm_tmp;
|
|
|
|
struct tm *start;
|
|
|
|
DBUG_ENTER("print_buffer_to_file");
|
|
|
|
DBUG_PRINT("enter",("buffer: %s", buffer));
|
|
|
|
|
2009-11-24 14:54:59 +01:00
|
|
|
pthread_mutex_lock(&LOCK_error_log);
|
2007-03-29 01:50:06 +02:00
|
|
|
|
2007-07-30 10:33:50 +02:00
|
|
|
skr= my_time(0);
|
2007-03-29 01:50:06 +02:00
|
|
|
localtime_r(&skr, &tm_tmp);
|
|
|
|
start=&tm_tmp;
|
2007-03-29 01:54:11 +02:00
|
|
|
|
2007-03-29 01:50:06 +02:00
|
|
|
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,
|
|
|
|
(level == ERROR_LEVEL ? "ERROR" : level == WARNING_LEVEL ?
|
|
|
|
"Warning" : "Note"),
|
|
|
|
buffer);
|
|
|
|
|
|
|
|
fflush(stderr);
|
|
|
|
|
2009-11-24 14:54:59 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_error_log);
|
2007-03-29 01:50:06 +02:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-09-12 04:46:41 +02:00
|
|
|
int vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
|
2004-08-14 03:38:37 +02:00
|
|
|
{
|
|
|
|
char buff[1024];
|
2007-03-29 03:49:30 +02:00
|
|
|
size_t length;
|
2004-08-19 17:56:32 +02:00
|
|
|
DBUG_ENTER("vprint_msg_to_log");
|
2004-08-14 03:38:37 +02:00
|
|
|
|
2007-03-28 10:12:33 +02:00
|
|
|
length= my_vsnprintf(buff, sizeof(buff), format, args);
|
2004-08-26 15:19:46 +02:00
|
|
|
print_buffer_to_file(level, buff);
|
2004-08-14 03:38:37 +02:00
|
|
|
|
2009-09-30 22:10:22 +02:00
|
|
|
#ifdef _WIN32
|
2004-08-27 23:49:54 +02:00
|
|
|
print_buffer_to_nt_eventlog(level, buff, length, sizeof(buff));
|
2004-08-14 03:38:37 +02:00
|
|
|
#endif
|
2004-08-18 22:31:01 +02:00
|
|
|
|
2006-01-19 03:56:06 +01:00
|
|
|
DBUG_RETURN(0);
|
2004-08-14 03:38:37 +02:00
|
|
|
}
|
2006-08-01 12:18:21 +02:00
|
|
|
#endif /*EMBEDDED_LIBRARY*/
|
2004-08-14 03:38:37 +02:00
|
|
|
|
2004-08-18 22:31:01 +02:00
|
|
|
|
2004-08-27 23:49:54 +02:00
|
|
|
void sql_print_error(const char *format, ...)
|
2004-08-14 03:38:37 +02:00
|
|
|
{
|
|
|
|
va_list args;
|
2004-08-26 15:19:46 +02:00
|
|
|
DBUG_ENTER("sql_print_error");
|
2004-08-14 03:38:37 +02:00
|
|
|
|
2004-08-26 15:19:46 +02:00
|
|
|
va_start(args, format);
|
2006-01-19 03:56:06 +01:00
|
|
|
error_log_print(ERROR_LEVEL, format, args);
|
2004-08-26 15:19:46 +02:00
|
|
|
va_end(args);
|
2004-08-14 03:38:37 +02:00
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-27 23:49:54 +02:00
|
|
|
void sql_print_warning(const char *format, ...)
|
2004-08-14 03:38:37 +02:00
|
|
|
{
|
|
|
|
va_list args;
|
2004-08-26 15:19:46 +02:00
|
|
|
DBUG_ENTER("sql_print_warning");
|
2004-08-14 03:38:37 +02:00
|
|
|
|
2004-08-26 15:19:46 +02:00
|
|
|
va_start(args, format);
|
2006-01-19 03:56:06 +01:00
|
|
|
error_log_print(WARNING_LEVEL, format, args);
|
2004-08-26 15:19:46 +02:00
|
|
|
va_end(args);
|
2004-08-14 03:38:37 +02:00
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-27 23:49:54 +02:00
|
|
|
void sql_print_information(const char *format, ...)
|
2004-08-14 03:38:37 +02:00
|
|
|
{
|
|
|
|
va_list args;
|
2004-08-26 15:19:46 +02:00
|
|
|
DBUG_ENTER("sql_print_information");
|
2004-08-14 03:38:37 +02:00
|
|
|
|
2004-08-26 15:19:46 +02:00
|
|
|
va_start(args, format);
|
2006-01-19 03:56:06 +01:00
|
|
|
error_log_print(INFORMATION_LEVEL, format, args);
|
2004-08-26 15:19:46 +02:00
|
|
|
va_end(args);
|
2004-08-14 03:38:37 +02:00
|
|
|
|
2004-06-20 19:11:02 +02:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2005-06-07 10:45:28 +02:00
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
/********* transaction coordinator log for 2pc - mmap() based solution *******/
|
|
|
|
|
|
|
|
/*
|
|
|
|
the log consists of a file, mmapped to a memory.
|
|
|
|
file is divided on pages of tc_log_page_size size.
|
|
|
|
(usable size of the first page is smaller because of log header)
|
|
|
|
there's PAGE control structure for each page
|
|
|
|
each page (or rather PAGE control structure) can be in one of three
|
2005-01-27 22:38:56 +01:00
|
|
|
states - active, syncing, pool.
|
|
|
|
there could be only one page in active or syncing states,
|
2005-01-16 13:16:23 +01:00
|
|
|
but many in pool - pool is fifo queue.
|
2005-01-27 22:38:56 +01:00
|
|
|
usual lifecycle of a page is pool->active->syncing->pool
|
2005-01-16 13:16:23 +01:00
|
|
|
"active" page - is a page where new xid's are logged.
|
2005-01-27 22:38:56 +01:00
|
|
|
the page stays active as long as syncing slot is taken.
|
|
|
|
"syncing" page is being synced to disk. no new xid can be added to it.
|
2005-01-16 13:16:23 +01:00
|
|
|
when the sync is done the page is moved to a pool and an active page
|
2005-01-27 22:38:56 +01:00
|
|
|
becomes "syncing".
|
|
|
|
|
|
|
|
the result of such an architecture is a natural "commit grouping" -
|
|
|
|
If commits are coming faster than the system can sync, they do not
|
|
|
|
stall. Instead, all commit that came since the last sync are
|
|
|
|
logged to the same page, and they all are synced with the next -
|
|
|
|
one - sync. Thus, thought individual commits are delayed, throughput
|
|
|
|
is not decreasing.
|
|
|
|
|
|
|
|
when a xid is added to an active page, the thread of this xid waits
|
|
|
|
for a page's condition until the page is synced. when syncing slot
|
|
|
|
becomes vacant one of these waiters is awaken to take care of syncing.
|
|
|
|
it syncs the page and signals all waiters that the page is synced.
|
2005-01-16 13:16:23 +01:00
|
|
|
PAGE::waiters is used to count these waiters, and a page may never
|
|
|
|
become active again until waiters==0 (that is all waiters from the
|
|
|
|
previous sync have noticed the sync was completed)
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
note, that the page becomes "dirty" and has to be synced only when a
|
|
|
|
new xid is added into it. Removing a xid from a page does not make it
|
2005-01-16 13:16:23 +01:00
|
|
|
dirty - we don't sync removals to disk.
|
|
|
|
*/
|
2005-06-07 10:45:28 +02:00
|
|
|
|
|
|
|
ulong tc_log_page_waits= 0;
|
|
|
|
|
|
|
|
#ifdef HAVE_MMAP
|
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
#define TC_LOG_HEADER_SIZE (sizeof(tc_log_magic)+1)
|
|
|
|
|
2005-02-25 15:53:22 +01:00
|
|
|
static const char tc_log_magic[]={(char) 254, 0x23, 0x05, 0x74};
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2005-03-03 15:38:58 +01:00
|
|
|
ulong opt_tc_log_size= TC_LOG_MIN_SIZE;
|
2005-06-07 10:45:28 +02:00
|
|
|
ulong tc_log_max_pages_used=0, tc_log_page_size=0, tc_log_cur_pages_used=0;
|
2005-01-16 13:16:23 +01:00
|
|
|
|
|
|
|
int TC_LOG_MMAP::open(const char *opt_name)
|
|
|
|
{
|
|
|
|
uint i;
|
|
|
|
bool crashed=FALSE;
|
|
|
|
PAGE *pg;
|
|
|
|
|
2005-02-01 15:36:48 +01:00
|
|
|
DBUG_ASSERT(total_ha_2pc > 1);
|
2005-01-16 13:16:23 +01:00
|
|
|
DBUG_ASSERT(opt_name && opt_name[0]);
|
|
|
|
|
2005-02-19 12:15:30 +01:00
|
|
|
tc_log_page_size= my_getpagesize();
|
2005-01-16 13:16:23 +01:00
|
|
|
DBUG_ASSERT(TC_LOG_PAGE_SIZE % tc_log_page_size == 0);
|
|
|
|
|
|
|
|
fn_format(logname,opt_name,mysql_data_home,"",MY_UNPACK_FILENAME);
|
2005-02-21 13:47:57 +01:00
|
|
|
if ((fd= my_open(logname, O_RDWR, MYF(0))) < 0)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2005-01-27 22:38:56 +01:00
|
|
|
if (my_errno != ENOENT)
|
|
|
|
goto err;
|
2005-01-16 13:16:23 +01:00
|
|
|
if (using_heuristic_recover())
|
|
|
|
return 1;
|
2007-02-15 15:50:56 +01:00
|
|
|
if ((fd= my_create(logname, CREATE_MODE, O_RDWR, MYF(MY_WME))) < 0)
|
2005-01-16 13:16:23 +01:00
|
|
|
goto err;
|
|
|
|
inited=1;
|
2005-01-27 22:38:56 +01:00
|
|
|
file_length= opt_tc_log_size;
|
2005-01-16 13:16:23 +01:00
|
|
|
if (my_chsize(fd, file_length, 0, MYF(MY_WME)))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2005-01-27 22:38:56 +01:00
|
|
|
inited= 1;
|
|
|
|
crashed= TRUE;
|
2005-03-14 09:27:34 +01:00
|
|
|
sql_print_information("Recovering after a crash using %s", opt_name);
|
2005-01-16 13:16:23 +01:00
|
|
|
if (tc_heuristic_recover)
|
|
|
|
{
|
|
|
|
sql_print_error("Cannot perform automatic crash recovery when "
|
|
|
|
"--tc-heuristic-recover is used");
|
|
|
|
goto err;
|
|
|
|
}
|
2005-01-27 22:38:56 +01:00
|
|
|
file_length= my_seek(fd, 0L, MY_SEEK_END, MYF(MY_WME+MY_FAE));
|
2005-01-16 13:16:23 +01:00
|
|
|
if (file_length == MY_FILEPOS_ERROR || file_length % tc_log_page_size)
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2005-03-19 01:12:25 +01:00
|
|
|
data= (uchar *)my_mmap(0, (size_t)file_length, PROT_READ|PROT_WRITE,
|
2005-01-16 13:16:23 +01:00
|
|
|
MAP_NOSYNC|MAP_SHARED, fd, 0);
|
|
|
|
if (data == MAP_FAILED)
|
|
|
|
{
|
|
|
|
my_errno=errno;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
inited=2;
|
|
|
|
|
2005-03-19 01:12:25 +01:00
|
|
|
npages=(uint)file_length/tc_log_page_size;
|
2005-01-16 13:16:23 +01:00
|
|
|
DBUG_ASSERT(npages >= 3); // to guarantee non-empty pool
|
|
|
|
if (!(pages=(PAGE *)my_malloc(npages*sizeof(PAGE), MYF(MY_WME|MY_ZEROFILL))))
|
|
|
|
goto err;
|
|
|
|
inited=3;
|
|
|
|
for (pg=pages, i=0; i < npages; i++, pg++)
|
|
|
|
{
|
|
|
|
pg->next=pg+1;
|
|
|
|
pg->waiters=0;
|
|
|
|
pg->state=POOL;
|
|
|
|
pthread_mutex_init(&pg->lock, MY_MUTEX_INIT_FAST);
|
|
|
|
pthread_cond_init (&pg->cond, 0);
|
|
|
|
pg->start=(my_xid *)(data + i*tc_log_page_size);
|
|
|
|
pg->end=(my_xid *)(pg->start + tc_log_page_size);
|
|
|
|
pg->size=pg->free=tc_log_page_size/sizeof(my_xid);
|
|
|
|
}
|
|
|
|
pages[0].size=pages[0].free=
|
|
|
|
(tc_log_page_size-TC_LOG_HEADER_SIZE)/sizeof(my_xid);
|
2005-01-27 22:38:56 +01:00
|
|
|
pages[0].start=pages[0].end-pages[0].size;
|
2005-01-16 13:16:23 +01:00
|
|
|
pages[npages-1].next=0;
|
|
|
|
inited=4;
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
if (crashed && recover())
|
2005-01-16 13:16:23 +01:00
|
|
|
goto err;
|
2005-01-27 22:38:56 +01:00
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
memcpy(data, tc_log_magic, sizeof(tc_log_magic));
|
2005-03-19 01:12:25 +01:00
|
|
|
data[sizeof(tc_log_magic)]= (uchar)total_ha_2pc;
|
2005-01-16 13:16:23 +01:00
|
|
|
my_msync(fd, data, tc_log_page_size, MS_SYNC);
|
|
|
|
inited=5;
|
|
|
|
|
|
|
|
pthread_mutex_init(&LOCK_sync, MY_MUTEX_INIT_FAST);
|
|
|
|
pthread_mutex_init(&LOCK_active, MY_MUTEX_INIT_FAST);
|
|
|
|
pthread_mutex_init(&LOCK_pool, MY_MUTEX_INIT_FAST);
|
|
|
|
pthread_cond_init(&COND_active, 0);
|
|
|
|
pthread_cond_init(&COND_pool, 0);
|
|
|
|
|
|
|
|
inited=6;
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
syncing= 0;
|
2005-01-16 13:16:23 +01:00
|
|
|
active=pages;
|
|
|
|
pool=pages+1;
|
|
|
|
pool_last=pages+npages-1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err:
|
|
|
|
close();
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
there is no active page, let's got one from the pool.
|
2005-01-27 22:38:56 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
Two strategies here:
|
|
|
|
-# take the first from the pool
|
|
|
|
-# if there're waiters - take the one with the most free space.
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@todo
|
|
|
|
TODO page merging. try to allocate adjacent page first,
|
|
|
|
so that they can be flushed both in one sync
|
2005-01-16 13:16:23 +01:00
|
|
|
*/
|
2007-10-11 19:29:09 +02:00
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
void TC_LOG_MMAP::get_active_from_pool()
|
|
|
|
{
|
|
|
|
PAGE **p, **best_p=0;
|
|
|
|
int best_free;
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
if (syncing)
|
|
|
|
pthread_mutex_lock(&LOCK_pool);
|
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
do
|
|
|
|
{
|
|
|
|
best_p= p= &pool;
|
2005-01-27 22:38:56 +01:00
|
|
|
if ((*p)->waiters == 0) // can the first page be used ?
|
|
|
|
break; // yes - take it.
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
best_free=0; // no - trying second strategy
|
2005-01-16 13:16:23 +01:00
|
|
|
for (p=&(*p)->next; *p; p=&(*p)->next)
|
|
|
|
{
|
|
|
|
if ((*p)->waiters == 0 && (*p)->free > best_free)
|
|
|
|
{
|
|
|
|
best_free=(*p)->free;
|
|
|
|
best_p=p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while ((*best_p == 0 || best_free == 0) && overflow());
|
|
|
|
|
|
|
|
active=*best_p;
|
2005-01-27 22:38:56 +01:00
|
|
|
if (active->free == active->size) // we've chosen an empty page
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
tc_log_cur_pages_used++;
|
|
|
|
set_if_bigger(tc_log_max_pages_used, tc_log_cur_pages_used);
|
|
|
|
}
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
if ((*best_p)->next) // unlink the page from the pool
|
2005-01-16 13:16:23 +01:00
|
|
|
*best_p=(*best_p)->next;
|
|
|
|
else
|
|
|
|
pool_last=*best_p;
|
2005-01-27 22:38:56 +01:00
|
|
|
|
|
|
|
if (syncing)
|
|
|
|
pthread_mutex_unlock(&LOCK_pool);
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
@todo
|
|
|
|
perhaps, increase log size ?
|
|
|
|
*/
|
2005-01-16 13:16:23 +01:00
|
|
|
int TC_LOG_MMAP::overflow()
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
simple overflow handling - just wait
|
|
|
|
TODO perhaps, increase log size ?
|
|
|
|
let's check the behaviour of tc_log_page_waits first
|
|
|
|
*/
|
|
|
|
tc_log_page_waits++;
|
|
|
|
pthread_cond_wait(&COND_pool, &LOCK_pool);
|
2005-01-27 22:38:56 +01:00
|
|
|
return 1; // always return 1
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Record that transaction XID is committed on the persistent storage.
|
2006-12-14 23:51:37 +01:00
|
|
|
|
|
|
|
This function is called in the middle of two-phase commit:
|
|
|
|
First all resources prepare the transaction, then tc_log->log() is called,
|
|
|
|
then all resources commit the transaction, then tc_log->unlog() is called.
|
|
|
|
|
|
|
|
All access to active page is serialized but it's not a problem, as
|
|
|
|
we're assuming that fsync() will be a main bottleneck.
|
|
|
|
That is, parallelizing writes to log pages we'll decrease number of
|
|
|
|
threads waiting for a page, but then all these threads will be waiting
|
|
|
|
for a fsync() anyway
|
|
|
|
|
|
|
|
If tc_log == MYSQL_LOG then tc_log writes transaction to binlog and
|
|
|
|
records XID in a special Xid_log_event.
|
|
|
|
If tc_log = TC_LOG_MMAP then xid is written in a special memory-mapped
|
|
|
|
log.
|
2005-01-27 22:38:56 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
|
|
|
0 - error
|
|
|
|
@retval
|
|
|
|
\# - otherwise, "cookie", a number that will be passed as an argument
|
|
|
|
to unlog() call. tc_log can define it any way it wants,
|
|
|
|
and use for whatever purposes. TC_LOG_MMAP sets it
|
|
|
|
to the position in memory where xid was logged to.
|
2005-01-16 13:16:23 +01:00
|
|
|
*/
|
|
|
|
|
2006-12-14 23:51:37 +01:00
|
|
|
int TC_LOG_MMAP::log_xid(THD *thd, my_xid xid)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
PAGE *p;
|
|
|
|
ulong cookie;
|
|
|
|
|
|
|
|
pthread_mutex_lock(&LOCK_active);
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
/*
|
|
|
|
if active page is full - just wait...
|
|
|
|
frankly speaking, active->free here accessed outside of mutex
|
|
|
|
protection, but it's safe, because it only means we may miss an
|
|
|
|
unlog() for the active page, and we're not waiting for it here -
|
|
|
|
unlog() does not signal COND_active.
|
|
|
|
*/
|
2005-01-16 13:16:23 +01:00
|
|
|
while (unlikely(active && active->free == 0))
|
|
|
|
pthread_cond_wait(&COND_active, &LOCK_active);
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
/* no active page ? take one from the pool */
|
2005-01-16 13:16:23 +01:00
|
|
|
if (active == 0)
|
|
|
|
get_active_from_pool();
|
|
|
|
|
|
|
|
p=active;
|
|
|
|
pthread_mutex_lock(&p->lock);
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
/* searching for an empty slot */
|
2005-01-16 13:16:23 +01:00
|
|
|
while (*p->ptr)
|
|
|
|
{
|
|
|
|
p->ptr++;
|
|
|
|
DBUG_ASSERT(p->ptr < p->end); // because p->free > 0
|
|
|
|
}
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
/* found! store xid there and mark the page dirty */
|
|
|
|
cookie= (ulong)((uchar *)p->ptr - data); // can never be zero
|
2005-01-16 13:16:23 +01:00
|
|
|
*p->ptr++= xid;
|
|
|
|
p->free--;
|
|
|
|
p->state= DIRTY;
|
|
|
|
|
|
|
|
/* to sync or not to sync - this is the question */
|
2005-01-27 22:38:56 +01:00
|
|
|
pthread_mutex_unlock(&LOCK_active);
|
2005-01-16 13:16:23 +01:00
|
|
|
pthread_mutex_lock(&LOCK_sync);
|
|
|
|
pthread_mutex_unlock(&p->lock);
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
if (syncing)
|
2005-01-16 13:16:23 +01:00
|
|
|
{ // somebody's syncing. let's wait
|
|
|
|
p->waiters++;
|
2005-01-27 22:38:56 +01:00
|
|
|
/*
|
2005-07-18 14:33:18 +02:00
|
|
|
note - it must be while (), not do ... while () here
|
2005-01-27 22:38:56 +01:00
|
|
|
as p->state may be not DIRTY when we come here
|
|
|
|
*/
|
|
|
|
while (p->state == DIRTY && syncing)
|
2005-01-16 13:16:23 +01:00
|
|
|
pthread_cond_wait(&p->cond, &LOCK_sync);
|
|
|
|
p->waiters--;
|
|
|
|
err= p->state == ERROR;
|
|
|
|
if (p->state != DIRTY) // page was synced
|
|
|
|
{
|
|
|
|
if (p->waiters == 0)
|
|
|
|
pthread_cond_signal(&COND_pool); // in case somebody's waiting
|
|
|
|
pthread_mutex_unlock(&LOCK_sync);
|
|
|
|
goto done; // we're done
|
|
|
|
}
|
|
|
|
} // page was not synced! do it now
|
2005-01-27 22:38:56 +01:00
|
|
|
DBUG_ASSERT(active == p && syncing == 0);
|
|
|
|
pthread_mutex_lock(&LOCK_active);
|
|
|
|
syncing=p; // place is vacant - take it
|
|
|
|
active=0; // page is not active anymore
|
2005-01-16 13:16:23 +01:00
|
|
|
pthread_cond_broadcast(&COND_active); // in case somebody's waiting
|
|
|
|
pthread_mutex_unlock(&LOCK_active);
|
|
|
|
pthread_mutex_unlock(&LOCK_sync);
|
|
|
|
err= sync();
|
|
|
|
|
|
|
|
done:
|
|
|
|
return err ? 0 : cookie;
|
|
|
|
}
|
|
|
|
|
|
|
|
int TC_LOG_MMAP::sync()
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
DBUG_ASSERT(syncing != active);
|
2005-01-16 13:16:23 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
sit down and relax - this can take a while...
|
|
|
|
note - no locks are held at this point
|
|
|
|
*/
|
2005-01-27 22:38:56 +01:00
|
|
|
err= my_msync(fd, syncing->start, 1, MS_SYNC);
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
/* page is synced. let's move it to the pool */
|
2005-01-16 13:16:23 +01:00
|
|
|
pthread_mutex_lock(&LOCK_pool);
|
2005-01-27 22:38:56 +01:00
|
|
|
pool_last->next=syncing;
|
|
|
|
pool_last=syncing;
|
|
|
|
syncing->next=0;
|
|
|
|
syncing->state= err ? ERROR : POOL;
|
|
|
|
pthread_cond_broadcast(&syncing->cond); // signal "sync done"
|
2005-01-16 13:16:23 +01:00
|
|
|
pthread_cond_signal(&COND_pool); // in case somebody's waiting
|
|
|
|
pthread_mutex_unlock(&LOCK_pool);
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
/* marking 'syncing' slot free */
|
2005-01-16 13:16:23 +01:00
|
|
|
pthread_mutex_lock(&LOCK_sync);
|
2005-01-27 22:38:56 +01:00
|
|
|
syncing=0;
|
2005-01-16 13:16:23 +01:00
|
|
|
pthread_cond_signal(&active->cond); // wake up a new syncer
|
|
|
|
pthread_mutex_unlock(&LOCK_sync);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
2005-01-27 22:38:56 +01:00
|
|
|
erase xid from the page, update page free space counters/pointers.
|
2007-10-11 19:29:09 +02:00
|
|
|
cookie points directly to the memory where xid was logged.
|
2005-01-27 22:38:56 +01:00
|
|
|
*/
|
2006-12-14 23:51:37 +01:00
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
void TC_LOG_MMAP::unlog(ulong cookie, my_xid xid)
|
|
|
|
{
|
|
|
|
PAGE *p=pages+(cookie/tc_log_page_size);
|
|
|
|
my_xid *x=(my_xid *)(data+cookie);
|
|
|
|
|
|
|
|
DBUG_ASSERT(*x == xid);
|
|
|
|
DBUG_ASSERT(x >= p->start && x < p->end);
|
|
|
|
*x=0;
|
|
|
|
|
|
|
|
pthread_mutex_lock(&p->lock);
|
|
|
|
p->free++;
|
|
|
|
DBUG_ASSERT(p->free <= p->size);
|
|
|
|
set_if_smaller(p->ptr, x);
|
2005-01-27 22:38:56 +01:00
|
|
|
if (p->free == p->size) // the page is completely empty
|
2005-01-16 13:16:23 +01:00
|
|
|
statistic_decrement(tc_log_cur_pages_used, &LOCK_status);
|
|
|
|
if (p->waiters == 0) // the page is in pool and ready to rock
|
2005-01-27 22:38:56 +01:00
|
|
|
pthread_cond_signal(&COND_pool); // ping ... for overflow()
|
2005-01-16 13:16:23 +01:00
|
|
|
pthread_mutex_unlock(&p->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
void TC_LOG_MMAP::close()
|
|
|
|
{
|
2005-02-19 12:15:30 +01:00
|
|
|
uint i;
|
2005-01-16 13:16:23 +01:00
|
|
|
switch (inited) {
|
|
|
|
case 6:
|
|
|
|
pthread_mutex_destroy(&LOCK_sync);
|
|
|
|
pthread_mutex_destroy(&LOCK_active);
|
|
|
|
pthread_mutex_destroy(&LOCK_pool);
|
|
|
|
pthread_cond_destroy(&COND_pool);
|
|
|
|
case 5:
|
|
|
|
data[0]='A'; // garble the first (signature) byte, in case my_delete fails
|
|
|
|
case 4:
|
2005-02-19 12:15:30 +01:00
|
|
|
for (i=0; i < npages; i++)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
if (pages[i].ptr == 0)
|
|
|
|
break;
|
|
|
|
pthread_mutex_destroy(&pages[i].lock);
|
|
|
|
pthread_cond_destroy(&pages[i].cond);
|
|
|
|
}
|
|
|
|
case 3:
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free((uchar*)pages, MYF(0));
|
2005-01-16 13:16:23 +01:00
|
|
|
case 2:
|
2007-05-31 16:45:22 +02:00
|
|
|
my_munmap((char*)data, (size_t)file_length);
|
2005-01-16 13:16:23 +01:00
|
|
|
case 1:
|
|
|
|
my_close(fd, MYF(0));
|
|
|
|
}
|
|
|
|
if (inited>=5) // cannot do in the switch because of Windows
|
|
|
|
my_delete(logname, MYF(MY_WME));
|
|
|
|
inited=0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int TC_LOG_MMAP::recover()
|
|
|
|
{
|
|
|
|
HASH xids;
|
|
|
|
PAGE *p=pages, *end_p=pages+npages;
|
|
|
|
|
|
|
|
if (memcmp(data, tc_log_magic, sizeof(tc_log_magic)))
|
|
|
|
{
|
|
|
|
sql_print_error("Bad magic header in tc log");
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
the first byte after magic signature is set to current
|
|
|
|
number of storage engines on startup
|
|
|
|
*/
|
|
|
|
if (data[sizeof(tc_log_magic)] != total_ha_2pc)
|
|
|
|
{
|
2005-02-21 13:47:57 +01:00
|
|
|
sql_print_error("Recovery failed! You must enable "
|
2005-01-27 22:38:56 +01:00
|
|
|
"exactly %d storage engines that support "
|
|
|
|
"two-phase commit protocol",
|
|
|
|
data[sizeof(tc_log_magic)]);
|
2005-01-16 13:16:23 +01:00
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
|
2009-10-14 18:37:38 +02:00
|
|
|
if (my_hash_init(&xids, &my_charset_bin, tc_log_page_size/3, 0,
|
|
|
|
sizeof(my_xid), 0, 0, MYF(0)))
|
2005-01-16 13:16:23 +01:00
|
|
|
goto err1;
|
|
|
|
|
|
|
|
for ( ; p < end_p ; p++)
|
|
|
|
{
|
|
|
|
for (my_xid *x=p->start; x < p->end; x++)
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (*x && my_hash_insert(&xids, (uchar *)x))
|
2005-01-16 13:16:23 +01:00
|
|
|
goto err2; // OOM
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ha_recover(&xids))
|
|
|
|
goto err2;
|
|
|
|
|
2009-10-14 18:37:38 +02:00
|
|
|
my_hash_free(&xids);
|
2005-03-19 01:12:25 +01:00
|
|
|
bzero(data, (size_t)file_length);
|
2005-01-16 13:16:23 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
err2:
|
2009-10-14 18:37:38 +02:00
|
|
|
my_hash_free(&xids);
|
2005-01-16 13:16:23 +01:00
|
|
|
err1:
|
|
|
|
sql_print_error("Crash recovery failed. Either correct the problem "
|
|
|
|
"(if it's, for example, out of memory error) and restart, "
|
|
|
|
"or delete tc log and start mysqld with "
|
|
|
|
"--tc-heuristic-recover={commit|rollback}");
|
|
|
|
return 1;
|
|
|
|
}
|
2005-02-20 20:08:33 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
TC_LOG *tc_log;
|
|
|
|
TC_LOG_DUMMY tc_log_dummy;
|
|
|
|
TC_LOG_MMAP tc_log_mmap;
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
Perform heuristic recovery, if --tc-heuristic-recover was used.
|
2005-02-01 15:36:48 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@note
|
2005-02-01 15:36:48 +01:00
|
|
|
no matter whether heuristic recovery was successful or not
|
|
|
|
mysqld must exit. So, return value is the same in both cases.
|
2007-10-11 19:29:09 +02:00
|
|
|
|
|
|
|
@retval
|
|
|
|
0 no heuristic recovery was requested
|
|
|
|
@retval
|
|
|
|
1 heuristic recovery was performed
|
2005-02-01 15:36:48 +01:00
|
|
|
*/
|
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
int TC_LOG::using_heuristic_recover()
|
|
|
|
{
|
|
|
|
if (!tc_heuristic_recover)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
sql_print_information("Heuristic crash recovery mode");
|
|
|
|
if (ha_recover(0))
|
|
|
|
sql_print_error("Heuristic crash recovery failed");
|
|
|
|
sql_print_information("Please restart mysqld without --tc-heuristic-recover");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/****** transaction coordinator log for 2pc - binlog() based solution ******/
|
2006-05-05 08:45:58 +02:00
|
|
|
#define TC_LOG_BINLOG MYSQL_BIN_LOG
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
@todo
|
|
|
|
keep in-memory list of prepared transactions
|
2005-01-16 13:16:23 +01:00
|
|
|
(add to list in log(), remove on unlog())
|
|
|
|
and copy it to the new binlog if rotated
|
|
|
|
but let's check the behaviour of tc_log_page_waits first!
|
|
|
|
*/
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
int TC_LOG_BINLOG::open(const char *opt_name)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2005-02-01 15:36:48 +01:00
|
|
|
LOG_INFO log_info;
|
|
|
|
int error= 1;
|
2005-01-16 13:16:23 +01:00
|
|
|
|
|
|
|
DBUG_ASSERT(total_ha_2pc > 1);
|
2005-02-01 15:36:48 +01:00
|
|
|
DBUG_ASSERT(opt_name && opt_name[0]);
|
2005-01-16 13:16:23 +01:00
|
|
|
|
|
|
|
pthread_mutex_init(&LOCK_prep_xids, MY_MUTEX_INIT_FAST);
|
|
|
|
pthread_cond_init (&COND_prep_xids, 0);
|
|
|
|
|
2005-04-23 00:05:05 +02:00
|
|
|
if (!my_b_inited(&index_file))
|
|
|
|
{
|
|
|
|
/* There was a failure to open the index file, can't open the binlog */
|
|
|
|
cleanup();
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
if (using_heuristic_recover())
|
2005-02-22 15:22:37 +01:00
|
|
|
{
|
|
|
|
/* generate a new binlog to mask a corrupted one */
|
2009-12-04 15:40:42 +01:00
|
|
|
open(opt_name, LOG_BIN, 0, WRITE_CACHE, 0, max_binlog_size, 0, TRUE);
|
2005-02-22 15:22:37 +01:00
|
|
|
cleanup();
|
2005-01-16 13:16:23 +01:00
|
|
|
return 1;
|
2005-02-22 15:22:37 +01:00
|
|
|
}
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2005-02-01 15:36:48 +01:00
|
|
|
if ((error= find_log_pos(&log_info, NullS, 1)))
|
2005-01-27 22:38:56 +01:00
|
|
|
{
|
2005-02-01 15:36:48 +01:00
|
|
|
if (error != LOG_INFO_EOF)
|
|
|
|
sql_print_error("find_log_pos() failed (error: %d)", error);
|
|
|
|
else
|
|
|
|
error= 0;
|
|
|
|
goto err;
|
2005-01-27 22:38:56 +01:00
|
|
|
}
|
2005-01-16 13:16:23 +01:00
|
|
|
|
|
|
|
{
|
|
|
|
const char *errmsg;
|
|
|
|
IO_CACHE log;
|
|
|
|
File file;
|
2005-01-27 22:38:56 +01:00
|
|
|
Log_event *ev=0;
|
|
|
|
Format_description_log_event fdle(BINLOG_VERSION);
|
2005-02-01 15:36:48 +01:00
|
|
|
char log_name[FN_REFLEN];
|
2005-01-16 13:16:23 +01:00
|
|
|
|
|
|
|
if (! fdle.is_valid())
|
|
|
|
goto err;
|
|
|
|
|
2005-02-21 13:47:57 +01:00
|
|
|
do
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2005-02-21 13:47:57 +01:00
|
|
|
strmake(log_name, log_info.log_file_name, sizeof(log_name)-1);
|
|
|
|
} while (!(error= find_next_log(&log_info, 1)));
|
|
|
|
|
|
|
|
if (error != LOG_INFO_EOF)
|
|
|
|
{
|
|
|
|
sql_print_error("find_log_pos() failed (error: %d)", error);
|
|
|
|
goto err;
|
2005-02-01 15:36:48 +01:00
|
|
|
}
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2005-02-01 15:36:48 +01:00
|
|
|
if ((file= open_binlog(&log, log_name, &errmsg)) < 0)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
sql_print_error("%s", errmsg);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2005-02-09 20:04:28 +01:00
|
|
|
if ((ev= Log_event::read_log_event(&log, 0, &fdle)) &&
|
|
|
|
ev->get_type_code() == FORMAT_DESCRIPTION_EVENT &&
|
|
|
|
ev->flags & LOG_EVENT_BINLOG_IN_USE_F)
|
2005-03-14 09:27:34 +01:00
|
|
|
{
|
|
|
|
sql_print_information("Recovering after a crash using %s", opt_name);
|
2005-02-22 15:22:37 +01:00
|
|
|
error= recover(&log, (Format_description_log_event *)ev);
|
2005-03-14 09:27:34 +01:00
|
|
|
}
|
2005-02-22 15:22:37 +01:00
|
|
|
else
|
|
|
|
error=0;
|
2005-01-16 13:16:23 +01:00
|
|
|
|
|
|
|
delete ev;
|
|
|
|
end_io_cache(&log);
|
|
|
|
my_close(file, MYF(MY_WME));
|
|
|
|
|
|
|
|
if (error)
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
err:
|
2005-02-01 15:36:48 +01:00
|
|
|
return error;
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/** This is called on shutdown, after ha_panic. */
|
2005-01-27 22:38:56 +01:00
|
|
|
void TC_LOG_BINLOG::close()
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
DBUG_ASSERT(prepared_xids==0);
|
|
|
|
pthread_mutex_destroy(&LOCK_prep_xids);
|
|
|
|
pthread_cond_destroy (&COND_prep_xids);
|
|
|
|
}
|
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
/**
|
|
|
|
@todo
|
|
|
|
group commit
|
2005-01-27 22:38:56 +01:00
|
|
|
|
2007-10-11 19:29:09 +02:00
|
|
|
@retval
|
|
|
|
0 error
|
|
|
|
@retval
|
|
|
|
1 success
|
2005-01-27 22:38:56 +01:00
|
|
|
*/
|
2006-12-14 23:51:37 +01:00
|
|
|
int TC_LOG_BINLOG::log_xid(THD *thd, my_xid xid)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2005-12-22 06:39:02 +01:00
|
|
|
DBUG_ENTER("TC_LOG_BINLOG::log");
|
2005-01-16 13:16:23 +01:00
|
|
|
Xid_log_event xle(thd, xid);
|
2005-12-22 06:39:02 +01:00
|
|
|
binlog_trx_data *trx_data=
|
2007-08-31 08:19:52 +02:00
|
|
|
(binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);
|
2006-10-05 10:46:14 +02:00
|
|
|
/*
|
|
|
|
We always commit the entire transaction when writing an XID. Also
|
|
|
|
note that the return value is inverted.
|
|
|
|
*/
|
|
|
|
DBUG_RETURN(!binlog_end_trans(thd, trx_data, &xle, TRUE));
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
void TC_LOG_BINLOG::unlog(ulong cookie, my_xid xid)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
2005-04-05 13:17:49 +02:00
|
|
|
pthread_mutex_lock(&LOCK_prep_xids);
|
2006-10-05 10:46:14 +02:00
|
|
|
DBUG_ASSERT(prepared_xids > 0);
|
2006-11-10 15:10:41 +01:00
|
|
|
if (--prepared_xids == 0) {
|
|
|
|
DBUG_PRINT("info", ("prepared_xids=%lu", prepared_xids));
|
2005-01-16 13:16:23 +01:00
|
|
|
pthread_cond_signal(&COND_prep_xids);
|
2006-11-10 15:10:41 +01:00
|
|
|
}
|
2005-04-05 13:17:49 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_prep_xids);
|
2005-03-02 10:38:25 +01:00
|
|
|
rotate_and_purge(0); // as ::write() did not rotate
|
2005-01-16 13:16:23 +01:00
|
|
|
}
|
|
|
|
|
2005-01-27 22:38:56 +01:00
|
|
|
int TC_LOG_BINLOG::recover(IO_CACHE *log, Format_description_log_event *fdle)
|
2005-01-16 13:16:23 +01:00
|
|
|
{
|
|
|
|
Log_event *ev;
|
|
|
|
HASH xids;
|
|
|
|
MEM_ROOT mem_root;
|
|
|
|
|
|
|
|
if (! fdle->is_valid() ||
|
2009-10-14 18:37:38 +02:00
|
|
|
my_hash_init(&xids, &my_charset_bin, TC_LOG_PAGE_SIZE/3, 0,
|
|
|
|
sizeof(my_xid), 0, 0, MYF(0)))
|
2005-01-16 13:16:23 +01:00
|
|
|
goto err1;
|
|
|
|
|
2005-02-22 00:43:37 +01:00
|
|
|
init_alloc_root(&mem_root, TC_LOG_PAGE_SIZE, TC_LOG_PAGE_SIZE);
|
2005-01-16 13:16:23 +01:00
|
|
|
|
2005-02-09 20:04:28 +01:00
|
|
|
fdle->flags&= ~LOG_EVENT_BINLOG_IN_USE_F; // abort on the first error
|
|
|
|
|
2005-01-16 13:16:23 +01:00
|
|
|
while ((ev= Log_event::read_log_event(log,0,fdle)) && ev->is_valid())
|
|
|
|
{
|
|
|
|
if (ev->get_type_code() == XID_EVENT)
|
|
|
|
{
|
|
|
|
Xid_log_event *xev=(Xid_log_event *)ev;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar *x= (uchar *) memdup_root(&mem_root, (uchar*) &xev->xid,
|
|
|
|
sizeof(xev->xid));
|
2009-11-20 16:18:01 +01:00
|
|
|
if (!x || my_hash_insert(&xids, x))
|
2005-01-16 13:16:23 +01:00
|
|
|
goto err2;
|
|
|
|
}
|
|
|
|
delete ev;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ha_recover(&xids))
|
|
|
|
goto err2;
|
|
|
|
|
|
|
|
free_root(&mem_root, MYF(0));
|
2009-10-14 18:37:38 +02:00
|
|
|
my_hash_free(&xids);
|
2005-01-16 13:16:23 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
err2:
|
|
|
|
free_root(&mem_root, MYF(0));
|
2009-10-14 18:37:38 +02:00
|
|
|
my_hash_free(&xids);
|
2005-01-16 13:16:23 +01:00
|
|
|
err1:
|
|
|
|
sql_print_error("Crash recovery failed. Either correct the problem "
|
|
|
|
"(if it's, for example, out of memory error) and restart, "
|
|
|
|
"or delete (or rename) binary log and start mysqld with "
|
|
|
|
"--tc-heuristic-recover={commit|rollback}");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-07-05 01:05:47 +02:00
|
|
|
|
|
|
|
#ifdef INNODB_COMPATIBILITY_HOOKS
|
|
|
|
/**
|
|
|
|
Get the file name of the MySQL binlog.
|
|
|
|
@return the name of the binlog file
|
|
|
|
*/
|
|
|
|
extern "C"
|
|
|
|
const char* mysql_bin_log_file_name(void)
|
|
|
|
{
|
|
|
|
return mysql_bin_log.get_log_fname();
|
|
|
|
}
|
|
|
|
/**
|
|
|
|
Get the current position of the MySQL binlog.
|
|
|
|
@return byte offset from the beginning of the binlog
|
|
|
|
*/
|
|
|
|
extern "C"
|
|
|
|
ulonglong mysql_bin_log_file_pos(void)
|
|
|
|
{
|
|
|
|
return (ulonglong) mysql_bin_log.get_log_file()->pos_in_file;
|
|
|
|
}
|
|
|
|
#endif /* INNODB_COMPATIBILITY_HOOKS */
|
|
|
|
|
|
|
|
|
2006-05-28 14:51:01 +02:00
|
|
|
struct st_mysql_storage_engine binlog_storage_engine=
|
2006-09-27 06:26:04 +02:00
|
|
|
{ MYSQL_HANDLERTON_INTERFACE_VERSION };
|
2006-04-13 22:49:29 +02:00
|
|
|
|
|
|
|
mysql_declare_plugin(binlog)
|
|
|
|
{
|
|
|
|
MYSQL_STORAGE_ENGINE_PLUGIN,
|
2006-05-28 14:51:01 +02:00
|
|
|
&binlog_storage_engine,
|
|
|
|
"binlog",
|
2006-04-13 22:49:29 +02:00
|
|
|
"MySQL AB",
|
2006-05-28 14:51:01 +02:00
|
|
|
"This is a pseudo storage engine to represent the binlog in a transaction",
|
2006-10-05 09:41:29 +02:00
|
|
|
PLUGIN_LICENSE_GPL,
|
2006-05-28 14:51:01 +02:00
|
|
|
binlog_init, /* Plugin Init */
|
2006-04-13 22:49:29 +02:00
|
|
|
NULL, /* Plugin Deinit */
|
|
|
|
0x0100 /* 1.0 */,
|
2006-08-30 23:27:29 +02:00
|
|
|
NULL, /* status variables */
|
|
|
|
NULL, /* system variables */
|
|
|
|
NULL /* config options */
|
2006-04-13 22:49:29 +02:00
|
|
|
}
|
|
|
|
mysql_declare_plugin_end;
|