Extend trx_trx library

romz-pl · Sep 6, 2019 · 64a9b65 · 64a9b65
1 parent 453eb88
commit 64a9b65
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 24 deletions.
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -46,6 +46,9 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "my_config.h"
 #endif /* !UNIV_HOTBACKUP */
 
+#include <innodb/trx_trx/trx_is_high_priority.h>
+#include <innodb/trx_trx/trx_is_rseg_updated.h>
+#include <innodb/trx_trx/trx_get_id_for_print.h>
 #include <innodb/trx_trx/trx_get_error_index.h>
 #include <innodb/trx_trx/trx_is_redo_rseg_updated.h>
 #include <innodb/memory_check/memory_check.h>

diff --git a/storage/innobase/handler/p_s.cc b/storage/innobase/handler/p_s.cc
@@ -29,6 +29,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
  *******************************************************/
 
+#include <innodb/trx_trx/trx_get_id_for_print.h>
 #include "storage/innobase/handler/p_s.h"
 
 #include <stdlib.h>

diff --git a/storage/innobase/include/trx0sys.ic b/storage/innobase/include/trx0sys.ic
@@ -30,6 +30,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 3/26/1996 Heikki Tuuri
  *******************************************************/
 
+#include <innodb/trx_trx/trx_reference.h>
+#include <innodb/trx_trx/assert_trx_in_rw_list.h>
 #include <innodb/trx_types/TrxIdSet.h>
 #include <innodb/trx_types/TrxTrack.h>
 #include <innodb/mtr/mtr_read_ulint.h>

diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
@@ -36,30 +36,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <innodb/univ/univ.h>
 
 
-#include <innodb/trx_trx/trx_is_rseg_updated.h>
-#include <innodb/trx_trx/trx_is_rseg_assigned.h>
-#include <innodb/trx_trx/trx_get_que_state_str.h>
-#include <innodb/trx_trx/trx_get_id_for_print.h>
-#include <innodb/trx_trx/trx_reference.h>
-#include <innodb/trx_trx/trx_release_reference.h>
-#include <innodb/trx_trx/trx_is_referenced.h>
-#include <innodb/trx_trx/trx_arbitrate.h>
-#include <innodb/trx_trx/trx_is_high_priority.h>
-#include <innodb/trx_trx/trx_is_rseg_updated.h>
-#include <innodb/trx_trx/trx_is_autocommit_non_locking.h>
-#include <innodb/trx_trx/trx_is_ac_nl_ro.h>
-#include <innodb/trx_trx/assert_trx_in_rw_list.h>
-#include <innodb/trx_trx/check_trx_state.h>
-#include <innodb/trx_trx/lock_pool_t.h>
-#include <innodb/trx_trx/trx_mod_tables_t.h>
-#include <innodb/trx_trx/trx_undo_ptr_t.h>
-#include <innodb/trx_trx/trx_rsegs_t.h>
-#include <innodb/trx_trx/TrxVersion.h>
-#include <innodb/trx_trx/hit_list_t.h>
-#include <innodb/trx_trx/trx_t.h>
-#include <innodb/trx_trx/trx_mutex_own.h>
-#include <innodb/trx_trx/trx_mutex_enter.h>
-#include <innodb/trx_trx/trx_mutex_exit.h>
+
 
 #include <list>
 #include <set>

diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
@@ -32,6 +32,11 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #define LOCK_MODULE_IMPLEMENTATION
 
+#include <innodb/trx_trx/trx_is_referenced.h>
+#include <innodb/trx_trx/trx_is_high_priority.h>
+#include <innodb/trx_trx/trx_arbitrate.h>
+#include <innodb/trx_trx/trx_release_reference.h>
+#include <innodb/trx_trx/trx_get_id_for_print.h>
 #include <innodb/trx_trx/trx_get_read_view.h>
 #include <innodb/trx_trx/trx_get_dict_operation.h>
 #include <innodb/trx_trx/thd_trx_priority.h>

diff --git a/storage/innobase/lock/lock0wait.cc b/storage/innobase/lock/lock0wait.cc
@@ -32,6 +32,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #define LOCK_MODULE_IMPLEMENTATION
 
+#include <innodb/trx_trx/trx_is_high_priority.h>
 #include <mysql/service_thd_wait.h>
 #include <sys/types.h>
 #include <time.h>

diff --git a/storage/innobase/row/row0vers.cc b/storage/innobase/row/row0vers.cc
@@ -30,6 +30,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 2/6/1997 Heikki Tuuri
  *******************************************************/
 
+#include <innodb/trx_trx/trx_release_reference.h>
 #include <innodb/cmp/cmp_dfield_dfield.h>
 #include <innodb/cmp/cmp_dtuple_rec.h>
 #include <innodb/data_types/dfield_is_null.h>

diff --git a/storage/innobase/trx/trx0i_s.cc b/storage/innobase/trx/trx0i_s.cc
@@ -42,6 +42,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
    From the symptoms, this is related to bug#46587 in the MySQL bug DB.
 */
 
+#include <innodb/trx_trx/trx_get_que_state_str.h>
+#include <innodb/trx_trx/trx_get_id_for_print.h>
 #include <innodb/sync_mutex/mutex_free.h>
 #include <innodb/mtr/mtr_start.h>
 #include <innodb/allocator/ut_malloc_nokey.h>

diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc
@@ -32,6 +32,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <sys/types.h>
 
+#include <innodb/trx_trx/trx_get_id_for_print.h>
+#include <innodb/trx_trx/trx_is_rseg_updated.h>
 #include <innodb/trx_trx/trx_is_temp_rseg_updated.h>
 #include <innodb/trx_trx/trx_is_redo_rseg_updated.h>
 #include <innodb/memory/mem_heap_zalloc.h>

diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
@@ -30,6 +30,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 3/26/1996 Heikki Tuuri
  *******************************************************/
 
+#include <innodb/trx_trx/trx_is_rseg_updated.h>
+#include <innodb/trx_trx/trx_get_id_for_print.h>
 #include <innodb/trx_trx/trx_is_temp_rseg_updated.h>
 #include <innodb/trx_trx/trx_is_redo_rseg_updated.h>
 #include <innodb/trx_trx/trx_set_dict_operation.h>