[Commits] 838dcdd551a: Merge remote-tracking branch 'origin/10.4' into bb-10.4-galera4

jan jan.lindstrom at mariadb.com
Wed Jan 2 08:39:04 EET 2019


revision-id: 838dcdd551afdb62abdcf4abe122fc00d12331e8 (mariadb-10.3.6-279-g838dcdd551a)
parent(s): a237499f178a61782f6bd5ec31835b367c35de91 2465d3e00b2f18c7d4967f9bb10438883682787d
author: Jan Lindström
committer: Jan Lindström
timestamp: 2019-01-02 08:39:01 +0200
message:

Merge remote-tracking branch 'origin/10.4' into bb-10.4-galera4


 include/my_counter.h                              |  3 ++
 plugin/query_response_time/query_response_time.cc | 39 ++++++++++-------------
 sql/log_event.cc                                  | 10 ++----
 sql/mysqld.h                                      |  1 +
 sql/opt_range.cc                                  |  4 ---
 sql/rpl_mi.h                                      |  6 ++--
 sql/slave.cc                                      | 13 ++------
 sql/sql_class.cc                                  | 31 +++++++++---------
 sql/sql_statistics.cc                             |  1 -
 sql/table.cc                                      |  1 -
 sql/table_cache.cc                                |  6 ++--
 storage/innobase/buf/buf0buf.cc                   |  4 +--
 storage/innobase/dict/dict0dict.cc                | 13 ++++----
 storage/innobase/fil/fil0fil.cc                   |  2 +-
 storage/innobase/gis/gis0sea.cc                   |  2 +-
 storage/innobase/ha/ha0ha.cc                      | 20 ++++--------
 storage/innobase/handler/ha_innodb.cc             | 18 ++++-------
 storage/innobase/ibuf/ibuf0ibuf.cc                | 28 +++++++---------
 storage/innobase/include/buf0buf.h                | 12 +++----
 storage/innobase/include/dict0mem.h               |  3 +-
 storage/innobase/include/fil0fil.h                | 38 ++++++----------------
 storage/innobase/include/ib0mutex.h               | 30 +++++++++--------
 storage/innobase/include/ibuf0ibuf.ic             |  4 +--
 storage/innobase/include/read0types.h             | 34 ++++++++++++--------
 storage/innobase/include/sync0types.h             | 18 -----------
 storage/innobase/include/ut0ut.h                  |  1 -
 storage/innobase/read/read0read.cc                | 10 +++---
 storage/innobase/srv/srv0srv.cc                   | 25 ++++++++-------
 28 files changed, 155 insertions(+), 222 deletions(-)

diff --cc sql/sql_class.cc
index a0d2ba8a362,2952adbd3e6..045ead31515
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@@ -66,14 -66,8 +66,13 @@@
  #include "sql_callback.h"
  #include "lock.h"
  #include "wsrep_mysqld.h"
 -#include "wsrep_thd.h"
  #include "sql_connect.h"
- #include "my_atomic.h"
 +#ifdef WITH_WSREP
 +#include "mysql/service_wsrep.h"
 +#include "wsrep_binlog.h" /* wsrep_fragment_unit() */
 +#include "wsrep_thd.h"
 +#include "wsrep_trans_observer.h"
 +#endif /* WITH_WSREP */
  
  #ifdef HAVE_SYS_SYSCALL_H
  #include <sys/syscall.h>


More information about the commits mailing list