[Commits] 7145d7b61b5: Revert unnecessary changes.

19 Dec 2018

revision-id: 7145d7b61b5e8915e08dec85c8eddd0a65d4a7ee (mariadb-10.3.6-260-g7145d7b61b5)
parent(s): 5460eeccad2dd3e4cd4ddff8a8958b5678e34454
author: Jan Lindström
committer: Jan Lindström
timestamp: 2018-12-19 09:27:03 +0200
message:

Revert unnecessary changes.
	modified:   storage/innobase/include/trx0trx.h
	modified:   storage/innobase/lock/lock0wait.cc
	modified:   storage/innobase/row/row0ins.cc
	modified:   storage/innobase/row/row0sel.cc
	modified:   storage/innobase/row/row0upd.cc
	modified:   storage/innobase/srv/srv0conc.cc
	modified:   storage/innobase/srv/srv0srv.cc
	modified:   storage/innobase/trx/trx0rseg.cc

---
 storage/innobase/include/trx0trx.h | 17 -----------------
 storage/innobase/lock/lock0wait.cc |  3 ---
 storage/innobase/row/row0ins.cc    |  2 ++
 storage/innobase/row/row0sel.cc    |  8 +-------
 storage/innobase/row/row0upd.cc    |  8 --------
 storage/innobase/srv/srv0conc.cc   |  3 ++-
 storage/innobase/srv/srv0srv.cc    |  3 ---
 storage/innobase/trx/trx0rseg.cc   |  2 +-
 8 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
index bab0dc64262..356fdf8adfd 100644
--- a/storage/innobase/include/trx0trx.h
+++ b/storage/innobase/include/trx0trx.h
@@ -268,23 +268,6 @@ trx_commit_step(
 /*============*/
 	que_thr_t*	thr);	/*!< in: query thread */
 
-#ifdef WITH_WSREP
-/**********************************************************************//**
-Prints info about a transaction.
-Transaction information may be retrieved without having trx_sys->mutex acquired
-so it may not be completely accurate. The caller must own lock_sys->mutex
-and the trx must have some locks to make sure that it does not escape
-without locking lock_sys->mutex. */
-UNIV_INTERN
-void
-wsrep_trx_print_locking(
-/*==============*/
-	FILE*		f,		/*!< in: output stream */
-	const trx_t*	trx,		/*!< in: transaction */
-	ulint		max_query_len)	/*!< in: max query length to print,
-					or 0 to use the default max length */
-	MY_ATTRIBUTE((nonnull));
-#endif /* WITH_WSREP */
 /**********************************************************************//**
 Prints info about a transaction.
 Caller must hold trx_sys.mutex. */
diff --git a/storage/innobase/lock/lock0wait.cc b/storage/innobase/lock/lock0wait.cc
index e86410965f7..6d482984f3f 100644
--- a/storage/innobase/lock/lock0wait.cc
+++ b/storage/innobase/lock/lock0wait.cc
@@ -36,9 +36,6 @@ Created 25/5/2010 Sunny Bains
 #include "row0mysql.h"
 #include "srv0start.h"
 #include "lock0priv.h"
-#ifdef WITH_WSREP
-#include "mysql/service_wsrep.h"
-#endif /* WITH_WSREP */
 /*********************************************************************//**
 Print the contents of the lock_sys_t::waiting_threads array. */
 static
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc
index b6b2a51a107..8fb716df0bc 100644
--- a/storage/innobase/row/row0ins.cc
+++ b/storage/innobase/row/row0ins.cc
@@ -44,7 +44,9 @@ Created 4/20/1996 Heikki Tuuri
 #include "buf0lru.h"
 #include "fts0fts.h"
 #include "fts0types.h"
+#ifdef WITH_WSREP
 #include "wsrep_mysqld.h"
+#endif /* WITH_WSREP */
 
 /*************************************************************************
 IMPORTANT NOTE: Any operation that generates redo MUST check that there
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
index c88912dc94f..e9b06be3c5b 100644
--- a/storage/innobase/row/row0sel.cc
+++ b/storage/innobase/row/row0sel.cc
@@ -54,13 +54,7 @@ Created 12/19/1997 Heikki Tuuri
 #include "buf0lru.h"
 #include "srv0srv.h"
 #include "srv0mon.h"
-#include "m_string.h" /* for my_sys.h */
-#include "my_sys.h" /* DEBUG_SYNC_C */
-
-#include "my_compare.h" /* enum icp_result */
-#include "thr_lock.h"
-#include "handler.h"
-#include "ha_innodb.h"
+#include "ha_innodb.h" /* For wsrep_thd_skip_locking */
 
 /* Maximum number of rows to prefetch; MySQL interface has another parameter */
 #define SEL_MAX_N_PREFETCH	16
diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc
index be27348683a..b4f2b91881a 100644
--- a/storage/innobase/row/row0upd.cc
+++ b/storage/innobase/row/row0upd.cc
@@ -49,9 +49,6 @@ Created 12/27/1996 Heikki Tuuri
 #include "trx0rec.h"
 #include "fts0fts.h"
 #include "fts0types.h"
-#ifdef WITH_WSREP
-#include "mysql/service_wsrep.h"
-#endif
 #include <algorithm>
 #include <mysql/plugin.h>
 #include <mysql/service_wsrep.h>
@@ -2437,10 +2434,6 @@ row_upd_sec_index_entry(
 		row_ins_sec_index_entry() below */
 		if (!rec_get_deleted_flag(
 			    rec, dict_table_is_comp(index->table))) {
-#ifdef WITH_WSREP
-			const upd_node_t* parent =
-				static_cast<const upd_node_t*>(node->common.parent);
-#endif /* WITH_WSREP */
 			err = btr_cur_del_mark_set_sec_rec(
 				flags, btr_cur, TRUE, thr, &mtr);
 			if (err != DB_SUCCESS) {
@@ -2451,7 +2444,6 @@ row_upd_sec_index_entry(
 			    && wsrep_must_process_fk(node, trx)
 			    && !wsrep_thd_is_BF(trx->mysql_thd, FALSE)) {
 
-
 				ulint*	offsets = rec_get_offsets(
 					rec, index, NULL, true,
 					ULINT_UNDEFINED, &heap);
diff --git a/storage/innobase/srv/srv0conc.cc b/storage/innobase/srv/srv0conc.cc
index 3042040ba1b..168ecd32211 100644
--- a/storage/innobase/srv/srv0conc.cc
+++ b/storage/innobase/srv/srv0conc.cc
@@ -122,9 +122,10 @@ srv_conc_enter_innodb_with_atomics(
 #ifdef WITH_WSREP
 		if (wsrep_on(trx->mysql_thd) &&
 		    wsrep_thd_is_aborting(trx->mysql_thd)) {
-			if (wsrep_debug)
+			if (wsrep_debug) {
 				ib::info() <<
 					"srv_conc_enter due to MUST_ABORT";
+			}
 			srv_conc_force_enter_innodb(trx);
 			return;
 		}
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index 504e7df339f..84dadb63896 100644
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -76,9 +76,6 @@ Created 10/8/1995 Heikki Tuuri
 
 #include <my_service_manager.h>
 
-#ifdef WITH_WSREP
-#include "mysql/service_wsrep.h"
-#endif
 /* The following is the maximum allowed duration of a lock wait. */
 UNIV_INTERN ulong	srv_fatal_semaphore_wait_threshold =  DEFAULT_SRV_FATAL_SEMAPHORE_TIMEOUT;
 
diff --git a/storage/innobase/trx/trx0rseg.cc b/storage/innobase/trx/trx0rseg.cc
index 8c10feb8b74..b96dffc0e78 100644
--- a/storage/innobase/trx/trx0rseg.cc
+++ b/storage/innobase/trx/trx0rseg.cc
@@ -57,7 +57,7 @@ trx_rseg_update_wsrep_checkpoint(
 
 #ifdef UNIV_DEBUG
 	/* Check that seqno is monotonically increasing */
-	long long xid_seqno  = wsrep_xid_seqno(xid);
+	long long xid_seqno = wsrep_xid_seqno(xid);
 	const byte* xid_uuid = wsrep_xid_uuid(xid);
 
 	if (!memcmp(xid_uuid, wsrep_uuid, sizeof wsrep_uuid) &&

    

[Commits] 7145d7b61b5: Revert unnecessary changes.

jan