mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
526798dbb5
a SELECT doesn't cause ROLLBACK of statem". The idea of the fix is to ensure that we always commit the current statement at the end of dispatch_command(). In order to not issue redundant disc syncs, an optimization of the two-phase commit protocol is implemented to bypass the two phase commit if the transaction is read-only. mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Update test results. mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Update test results. mysql-test/suite/rpl_ndb/t/disabled.def: Disable the tests, for which this changeset reveals a bug: the injector thread does not always add 'statement commit' to the rows injected in circular replication set up. To be investigated separately. sql/ha_ndbcluster_binlog.cc: Add close_thread_tables() to run_query: this ensures that all tables are closed and there is no pending statement transaction. sql/handler.cc: Implement optimisation of read-only transactions. If a transaction consists only of DML statements that do not change data, we do not perform a two-phase commit for it (run one phase commit only). sql/handler.h: Implement optimisation of read-only transactions. If a transaction consists only of DML statements that do not change data, we do not perform a two-phase commit for it (run one phase commit only). sql/log.cc: Mark the binlog transaction read-write whenever it's started. We never read from binlog, so it's safe and least intrusive to add this mark up here. sql/log_event.cc: Update to the new layout of thd->transaction. sql/rpl_injector.cc: Always commit statement transaction before committing the global one. sql/sp.cc: Ad comments. sql/sp_head.cc: Add comments. sql/sql_base.cc: Commit transaction at the end of the statement. Always. sql/sql_class.cc: Update thd_ha_data to return the right pointer in the new layout. Fix select_dumpvar::send_data to properly return operation status. A test case from commit.inc would lead to an assertion failure in the diagnostics area (double assignment). Not test otherwise by the test suite. sql/sql_class.h: Implement a new layout of storage engine transaction info in which it is easy to access all members related to the handlerton only based on ht->slot. sql/sql_cursor.cc: Update to the new layout of thd->transaction. sql/sql_delete.cc: Remove wrong and now redundant calls to ha_autocommit_or_rollback. The transaction is committed in one place, at the end of the statement. Remove calls to mysql_unlock_tables, since some engines count locks and commit statement transaction in unlock_tables(), which essentially equates mysql_unlock_tables to ha_autocommit_or_rollback. Previously it was necessary to unlock tables soon because we wanted to avoid sending of 'ok' packet to the client under locked tables. This is no longer necessary, since OK packet is also sent from one place at the end of transaction. sql/sql_do.cc: Add DO always clears the error, we must rollback the current statement before this happens. Otherwise the statement will be committed, and not rolled back in the end. sql/sql_insert.cc: Remove wrong and now redundant calls to ha_autocommit_or_rollback. The transaction is committed in one place, at the end of the statement. Remove calls to mysql_unlock_tables, since some engines count locks and commit statement transaction in unlock_tables(), which essentially equates mysql_unlock_tables to ha_autocommit_or_rollback. Previously it was necessary to unlock tables soon because we wanted to avoid sending of 'ok' packet to the client under locked tables. This is no longer necessary, since OK packet is also sent from one place at the end of transaction. sql/sql_load.cc: Remove wrong and now redundant calls to ha_autocommit_or_rollback. The transaction is committed in one place, at the end of the statement. Remove calls to mysql_unlock_tables, since some engines count locks and commit statement transaction in unlock_tables(), which essentially equates mysql_unlock_tables to ha_autocommit_or_rollback. Previously it was necessary to unlock tables soon because we wanted to avoid sending of 'ok' packet to the client under locked tables. This is no longer necessary, since OK packet is also sent from one place at the end of transaction. sql/sql_parse.cc: Implement optimisation of read-only transactions: bypass 2-phase commit for them. Always commit statement transaction before commiting the global one. Fix an unrelated crash in check_table_access, when called from information_schema. sql/sql_partition.cc: Partitions commit at the end of a DDL operation. Make sure that send_ok() is done only if the commit has succeeded. sql/sql_table.cc: Use ha_autocommit_or_rollback and end_active_trans everywhere. Add end_trans to mysql_admin_table, so that it leaves no pending transaction. sql/sql_udf.cc: Remvove a redundant call to close_thread_tables() sql/sql_update.cc: Remove wrong and now redundant calls to ha_autocommit_or_rollback. The transaction is committed in one place, at the end of the statement. Remove calls to mysql_unlock_tables, since some engines count locks and commit statement transaction in unlock_tables(), which essentially equates mysql_unlock_tables to ha_autocommit_or_rollback. Previously it was necessary to unlock tables soon because we wanted to avoid sending of 'ok' packet to the client under locked tables. This is no longer necessary, since OK packet is also sent from one place at the end of transaction. mysql-test/include/commit.inc: New BitKeeper file ``mysql-test/include/commit.inc'' mysql-test/r/commit_1innodb.result: New BitKeeper file ``mysql-test/r/commit_1innodb.result'' mysql-test/t/commit_1innodb.test: New BitKeeper file ``mysql-test/t/commit_1innodb.test''
236 lines
6.6 KiB
C++
236 lines
6.6 KiB
C++
/* Copyright (C) 2006 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
#include "mysql_priv.h"
|
|
#include "rpl_injector.h"
|
|
|
|
/*
|
|
injector::transaction - member definitions
|
|
*/
|
|
|
|
/* inline since it's called below */
|
|
inline
|
|
injector::transaction::transaction(MYSQL_BIN_LOG *log, THD *thd)
|
|
: m_state(START_STATE), m_thd(thd)
|
|
{
|
|
/*
|
|
Default initialization of m_start_pos (which initializes it to garbage).
|
|
We need to fill it in using the code below.
|
|
*/
|
|
LOG_INFO log_info;
|
|
log->get_current_log(&log_info);
|
|
/* !!! binlog_pos does not follow RAII !!! */
|
|
m_start_pos.m_file_name= my_strdup(log_info.log_file_name, MYF(0));
|
|
m_start_pos.m_file_pos= log_info.pos;
|
|
|
|
begin_trans(m_thd);
|
|
|
|
thd->set_current_stmt_binlog_row_based();
|
|
}
|
|
|
|
injector::transaction::~transaction()
|
|
{
|
|
if (!good())
|
|
return;
|
|
|
|
/* Needed since my_free expects a 'char*' (instead of 'void*'). */
|
|
char* const the_memory= const_cast<char*>(m_start_pos.m_file_name);
|
|
|
|
/*
|
|
We set the first character to null just to give all the copies of the
|
|
start position a (minimal) chance of seening that the memory is lost.
|
|
All assuming the my_free does not step over the memory, of course.
|
|
*/
|
|
*the_memory= '\0';
|
|
|
|
my_free(the_memory, MYF(0));
|
|
}
|
|
|
|
int injector::transaction::commit()
|
|
{
|
|
DBUG_ENTER("injector::transaction::commit()");
|
|
m_thd->binlog_flush_pending_rows_event(true);
|
|
/*
|
|
Cluster replication does not preserve statement or
|
|
transaction boundaries of the master. Instead, a new
|
|
transaction on replication slave is started when a new GCI
|
|
(global checkpoint identifier) is issued, and is committed
|
|
when the last event of the check point has been received and
|
|
processed. This ensures consistency of each cluster in
|
|
cluster replication, and there is no requirement for stronger
|
|
consistency: MySQL replication is asynchronous with other
|
|
engines as well.
|
|
|
|
A practical consequence of that is that row level replication
|
|
stream passed through the injector thread never contains
|
|
COMMIT events.
|
|
Here we should preserve the server invariant that there is no
|
|
outstanding statement transaction when the normal transaction
|
|
is committed by committing the statement transaction
|
|
explicitly.
|
|
*/
|
|
ha_autocommit_or_rollback(m_thd, 0);
|
|
end_trans(m_thd, COMMIT);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
int injector::transaction::use_table(server_id_type sid, table tbl)
|
|
{
|
|
DBUG_ENTER("injector::transaction::use_table");
|
|
|
|
int error;
|
|
|
|
if ((error= check_state(TABLE_STATE)))
|
|
DBUG_RETURN(error);
|
|
|
|
server_id_type save_id= m_thd->server_id;
|
|
m_thd->set_server_id(sid);
|
|
error= m_thd->binlog_write_table_map(tbl.get_table(),
|
|
tbl.is_transactional());
|
|
m_thd->set_server_id(save_id);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
int injector::transaction::write_row (server_id_type sid, table tbl,
|
|
MY_BITMAP const* cols, size_t colcnt,
|
|
record_type record)
|
|
{
|
|
DBUG_ENTER("injector::transaction::write_row(...)");
|
|
|
|
if (int error= check_state(ROW_STATE))
|
|
DBUG_RETURN(error);
|
|
|
|
server_id_type save_id= m_thd->server_id;
|
|
m_thd->set_server_id(sid);
|
|
m_thd->binlog_write_row(tbl.get_table(), tbl.is_transactional(),
|
|
cols, colcnt, record);
|
|
m_thd->set_server_id(save_id);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
int injector::transaction::delete_row(server_id_type sid, table tbl,
|
|
MY_BITMAP const* cols, size_t colcnt,
|
|
record_type record)
|
|
{
|
|
DBUG_ENTER("injector::transaction::delete_row(...)");
|
|
|
|
if (int error= check_state(ROW_STATE))
|
|
DBUG_RETURN(error);
|
|
|
|
server_id_type save_id= m_thd->server_id;
|
|
m_thd->set_server_id(sid);
|
|
m_thd->binlog_delete_row(tbl.get_table(), tbl.is_transactional(),
|
|
cols, colcnt, record);
|
|
m_thd->set_server_id(save_id);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
int injector::transaction::update_row(server_id_type sid, table tbl,
|
|
MY_BITMAP const* cols, size_t colcnt,
|
|
record_type before, record_type after)
|
|
{
|
|
DBUG_ENTER("injector::transaction::update_row(...)");
|
|
|
|
if (int error= check_state(ROW_STATE))
|
|
DBUG_RETURN(error);
|
|
|
|
server_id_type save_id= m_thd->server_id;
|
|
m_thd->set_server_id(sid);
|
|
m_thd->binlog_update_row(tbl.get_table(), tbl.is_transactional(),
|
|
cols, colcnt, before, after);
|
|
m_thd->set_server_id(save_id);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
injector::transaction::binlog_pos injector::transaction::start_pos() const
|
|
{
|
|
return m_start_pos;
|
|
}
|
|
|
|
|
|
/*
|
|
injector - member definitions
|
|
*/
|
|
|
|
/* This constructor is called below */
|
|
inline injector::injector()
|
|
{
|
|
}
|
|
|
|
static injector *s_injector= 0;
|
|
injector *injector::instance()
|
|
{
|
|
if (s_injector == 0)
|
|
s_injector= new injector;
|
|
/* "There can be only one [instance]" */
|
|
return s_injector;
|
|
}
|
|
|
|
void injector::free_instance()
|
|
{
|
|
injector *inj = s_injector;
|
|
|
|
if (inj != 0)
|
|
{
|
|
s_injector= 0;
|
|
delete inj;
|
|
}
|
|
}
|
|
|
|
|
|
injector::transaction injector::new_trans(THD *thd)
|
|
{
|
|
DBUG_ENTER("injector::new_trans(THD*)");
|
|
/*
|
|
Currently, there is no alternative to using 'mysql_bin_log' since that
|
|
is hardcoded into the way the handler is using the binary log.
|
|
*/
|
|
DBUG_RETURN(transaction(&mysql_bin_log, thd));
|
|
}
|
|
|
|
void injector::new_trans(THD *thd, injector::transaction *ptr)
|
|
{
|
|
DBUG_ENTER("injector::new_trans(THD *, transaction *)");
|
|
/*
|
|
Currently, there is no alternative to using 'mysql_bin_log' since that
|
|
is hardcoded into the way the handler is using the binary log.
|
|
*/
|
|
transaction trans(&mysql_bin_log, thd);
|
|
ptr->swap(trans);
|
|
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
int injector::record_incident(THD *thd, Incident incident)
|
|
{
|
|
Incident_log_event ev(thd, incident);
|
|
if (int error= mysql_bin_log.write(&ev))
|
|
return error;
|
|
mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE);
|
|
return 0;
|
|
}
|
|
|
|
int injector::record_incident(THD *thd, Incident incident, LEX_STRING const message)
|
|
{
|
|
Incident_log_event ev(thd, incident, message);
|
|
if (int error= mysql_bin_log.write(&ev))
|
|
return error;
|
|
mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE);
|
|
return 0;
|
|
}
|