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

jan jan.lindstrom at mariadb.com
Mon Jan 14 09:14:01 EET 2019


revision-id: 18279fc377e5c087e30a23b425f2c866a796f255 (mariadb-10.3.6-297-g18279fc377e)
parent(s): addba9c09d0295328ecd999e463f962824a3312b e7924a8598cbb785363ddd6489cb3c1210347f5f
author: Jan Lindström
committer: Jan Lindström
timestamp: 2019-01-14 09:13:56 +0200
message:

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


 include/my_counter.h                               |   2 +
 mysql-test/include/have_auth_named_pipe.inc        |  13 +
 mysql-test/main/max_password_errors.result         |  45 ++
 mysql-test/main/max_password_errors.test           |  64 +++
 mysql-test/main/mysqld--help.result                |   5 +
 mysql-test/suite/galera/disabled.def               |   8 +-
 mysql-test/suite/innodb/disabled.def               |   1 -
 .../suite/innodb/r/alter_inplace_perfschema.result |   9 +-
 mysql-test/suite/innodb/r/instant_alter.result     | 212 ++++++++-
 mysql-test/suite/innodb/r/instant_drop.result      |  14 +-
 .../suite/innodb/t/alter_inplace_perfschema.test   |   8 +-
 mysql-test/suite/innodb/t/instant_alter.test       |  77 +++
 mysql-test/suite/innodb/t/instant_drop.test        |  11 +-
 .../r/max_password_errors_auth_named_pipe.result   |  12 +
 .../r/max_password_errors_auth_socket.result       |  12 +
 .../t/max_password_errors_auth_named_pipe.opt      |   1 +
 .../t/max_password_errors_auth_named_pipe.test     |  22 +
 .../plugins/t/max_password_errors_auth_socket.opt  |   1 +
 .../plugins/t/max_password_errors_auth_socket.test |  23 +
 .../sys_vars/r/sysvars_server_embedded.result      |  14 +
 .../sys_vars/r/sysvars_server_notembedded.result   |  14 +
 scripts/wsrep_sst_mariabackup.sh                   |  21 +-
 sql/mysqld.cc                                      |   1 +
 sql/mysqld.h                                       |   1 +
 sql/share/errmsg-utf8.txt                          |   2 +
 sql/sql_acl.cc                                     |  67 +++
 sql/sys_vars.cc                                    |   8 +
 storage/innobase/btr/btr0btr.cc                    |  70 +--
 storage/innobase/btr/btr0bulk.cc                   |   2 +-
 storage/innobase/btr/btr0cur.cc                    |  19 +-
 storage/innobase/buf/buf0buf.cc                    |  36 +-
 storage/innobase/buf/buf0flu.cc                    | 159 ++-----
 storage/innobase/buf/buf0lru.cc                    |   2 +-
 storage/innobase/data/data0data.cc                 |   3 +-
 storage/innobase/handler/ha_innodb.cc              |  13 +-
 storage/innobase/handler/handler0alter.cc          |   9 +-
 storage/innobase/include/btr0btr.h                 |   4 +-
 storage/innobase/include/buf0buf.h                 |  44 +-
 storage/innobase/include/buf0buf.ic                |  53 +--
 storage/innobase/include/buf0flu.h                 |  12 -
 storage/innobase/include/buf0flu.ic                |  79 +---
 storage/innobase/include/ib0mutex.h                |  23 +-
 storage/innobase/include/mtr0mtr.ic                |   2 +-
 storage/innobase/include/srv0srv.h                 |   1 -
 storage/innobase/include/sync0policy.h             | 522 ++++++++-------------
 storage/innobase/include/sync0policy.ic            | 101 ----
 storage/innobase/include/sync0rw.h                 |   1 -
 storage/innobase/include/sync0types.h              |  30 --
 storage/innobase/include/ut0mutex.h                |   2 -
 storage/innobase/log/log0recv.cc                   |   2 +-
 storage/innobase/mtr/mtr0mtr.cc                    |   4 +-
 storage/innobase/os/os0event.cc                    |   2 +-
 storage/innobase/row/row0upd.cc                    |   2 +-
 storage/innobase/srv/srv0srv.cc                    |  11 +-
 storage/innobase/sync/sync0arr.cc                  |  26 +-
 storage/innobase/sync/sync0rw.cc                   |  24 +-
 storage/innobase/trx/trx0trx.cc                    |   4 +-
 57 files changed, 981 insertions(+), 949 deletions(-)

diff --cc mysql-test/suite/galera/disabled.def
index 9a173a484c4,23c9b9d7b55..bf03a4c488d
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@@ -50,20 -50,6 +50,14 @@@ galera_pc_ignore_sb : MDEV-17357 Test f
  MW-328A : MDEV-17847 Galera test failure on MW-328[A|B|C]
  MW-328B : MDEV-17847 Galera test failure on MW-328[A|B|C]
  MW-328C : MDEV-17847 Galera test failure on MW-328[A|B|C]
- galera_autoinc_sst_xtrabackup : xtrabackup is deprecated
- galera_ist_xtrabackup-v2 : xtrabackup is deprecated
- galera_sst_xtrabackup-v2_data_dir : xtrabackup is deprecated
- galera_sst_xtrabackup-v2_encrypt_with_key : xtrabackup is deprecated
- galera_sst_xtrabackup-v2-options : xtrabackup is deprecated
- galera_ist_innodb_flush_logs : xtrabackup is deprecated
- galera_sst_xtrabackup-v2 : xtrabackup is deprecated
  galera.galera_encrypt_tmp_files : Get error failed to enable encryption of temporary files
  galera.galera_var_reject_queries : assertion in inline_mysql_socket_send
+ query_cache : MDEV-18137: Galera test failure on query_cache
 +galera.galera_ist_mariabackup : Leaves port open
 +galera.galera_autoinc_sst_mariabackup : MDEV-18177 Galera test failure on galera_autoinc_sst_mariabackup
 +galera.galera_gtid_slave_sst_rsync: MDEV-18176 Galera test failure on galera.galera_gtid_slave_sst_rsync
 +galera.galera_sst_rsync2 : MDEV-18178 Galera test failure on galera_sst_rsync2
 +galera.galera_kill_largechanges : MDEV-18179 Galera test failure on galera.galera_kill_largechanges
 +galera.galera_concurrent_ctas : MDEV-18180 Galera test failure on galera.galera_concurrent_ctas
 +galera.galera_var_retry_autocommit: MDEV-18181 Galera test failure on galera.galera_var_retry_autocommit
 +galera.galera_many_tables_nopk : MDEV-18182 Galera test failure on galera.galera_many_tables_nopk


More information about the commits mailing list