database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Bug#16837 (Missing #ifdef cause compile problem --without-row-based-replication):

Browse Source 
Added #ifdef's to make code work even when the system is built without
row-based replication.


mysql-test/r/create.result:
  Result change
mysql-test/r/innodb_mysql.result:
  Result change
mysql-test/t/create.test:
  Moving InnoDB specific test to innodb_mysql.test
mysql-test/t/innodb_mysql.test:
  Moving InnoDB-specific test from create.test
mysql-test/t/rpl_rbr_to_sbr.test:
  Test only sensible if we have row-based replication compiled in.
mysql-test/t/rpl_row_basic_8partition.test:
  Test only sensible if we have row-based replication compiled in.
sql/log.cc:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/set_var.cc:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/set_var.h:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/share/errmsg.txt:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/sql_base.cc:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/sql_class.cc:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/sql_class.h:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/sql_insert.cc:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/sql_parse.cc:
  Adding HAVE_ROW_BASED_REPLICATION guards on code to work without
  row-based replication.
sql/sql_table.cc:
  Not running hooks
This commit is contained in:
unknown
2006-05-16 11:16:23 +02:00
parent 564a94da7b
commit 36815fa1ad
16 changed files with 93 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_class.cc
View File

@@ -197,7 +197,10 @@ THD::THD()
:Statement(CONVENTIONAL_EXECUTION, 0, ALLOC_ROOT_MIN_BLOCK_SIZE, 0),
Open_tables_state(refresh_version), rli_fake(0),
lock_id(&main_lock_id),
user_time(0), in_sub_stmt(0), binlog_table_maps(0),
user_time(0), in_sub_stmt(0),
#ifdef HAVE_ROW_BASED_REPLICATION
binlog_table_maps(0),
#endif
global_read_lock(0), is_fatal_error(0),
rand_used(0), time_zone_used(0),
last_insert_id_used(0), insert_id_used(0), clear_next_insert_id(0),
@@ -2110,7 +2113,9 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup,
if ((!lex->requires_prelocking() || is_update_query(lex->sql_command)) &&
!current_stmt_binlog_row_based)
{
options&= ~OPTION_BIN_LOG;
}
/* Disable result sets */
client_capabilities &= ~CLIENT_MULTI_RESULTS;
in_sub_stmt|= new_state;
@@ -2699,6 +2704,7 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype,
to how you treat this.
*/
case THD::ROW_QUERY_TYPE:
#ifdef HAVE_ROW_BASED_REPLICATION
if (current_stmt_binlog_row_based)
{
/*
@@ -2717,6 +2723,7 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype,
DBUG_RETURN(binlog_flush_pending_rows_event(TRUE));
DBUG_RETURN(0);
}
#endif
/* Otherwise, we fall through */
case THD::STMT_QUERY_TYPE:
/*
@@ -2725,7 +2732,9 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype,
*/
{
Query_log_event qinfo(this, query, query_len, is_trans, suppress_use);
#ifdef HAVE_ROW_BASED_REPLICATION
qinfo.flags|= LOG_EVENT_UPDATE_TABLE_MAP_VERSION_F;
#endif
/*
Binlog table maps will be irrelevant after a Query_log_event
(they are just removed on the slave side) so after the query
@@ -2733,7 +2742,9 @@ int THD::binlog_query(THD::enum_binlog_query_type qtype,
table maps were written.
*/
int error= mysql_bin_log.write(&qinfo);
#ifdef HAVE_ROW_BASED_REPLICATION
binlog_table_maps= 0;
#endif
DBUG_RETURN(error);
}
break;