mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
SCRUM
embedded library trimming include/my_global.h: HAVE_REPLICATION & HAVE_EXTERNAL_CLIENT macro definitions libmysqld/lib_sql.cc: Protocol:: methods implementation for embedded case sql/field.cc: geometry type methods implementations sql/ha_berkeley.cc: set_nfields deletion sql/ha_innodb.cc: macro changed sql/ha_myisam.cc: set_nfields deletion sql/ha_myisam.h: code #ifdef-ed sql/item.cc: bugfix sql/item_func.cc: macro changed sql/item_strfunc.cc: superfluous code deleted sql/log.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/log_event.cc: #ifdef constructions changed sql/log_event.h: #ifdef-s changed sql/mf_iocache.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/mini_client.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/mysql_priv.h: code removation sql/mysqld.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/opt_range.cc: code trimming sql/protocol.cc: net_store_data becomes a member of Protocol sql/protocol.h: changes to make Protocol working in embedded library sql/repl_failsafe.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/repl_failsafe.h: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/set_var.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/slave.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/slave.h: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/sql_parse.cc: code trimming sql/sql_prepare.cc: comment added sql/sql_repl.cc: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/sql_repl.h: HAVE_REPLICATION instead of EMBEDDED_LIBRARY sql/sql_show.cc: mysql_list_processes to work in embedded library sql/sql_table.cc: set_nfields deletion
This commit is contained in:
@ -871,7 +871,7 @@ innobase_commit_low(
|
||||
/*================*/
|
||||
trx_t* trx) /* in: transaction handle */
|
||||
{
|
||||
#ifndef EMBEDDED_LIBRARY
|
||||
#ifdef HAVE_REPLICATION
|
||||
if (current_thd->slave_thread) {
|
||||
/* Update the replication position info inside InnoDB */
|
||||
#ifdef NEED_TO_BE_FIXED
|
||||
@ -885,7 +885,7 @@ innobase_commit_low(
|
||||
active_mi->rli.event_len +
|
||||
active_mi->rli.pending));
|
||||
}
|
||||
#endif /* EMBEDDED_LIBRARY */
|
||||
#endif /* HAVE_REPLICATION */
|
||||
trx_commit_for_mysql(trx);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user