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

jan jan.lindstrom at mariadb.com
Thu Jan 17 17:22:04 EET 2019


revision-id: a90b739d4b925729b7135c785a5f255f5a7fced2 (mariadb-10.3.6-327-ga90b739d4b9)
parent(s): e5a7ef0e34e72b87818af52fc0c8447c2bb49432 5fb4e4ab3939402ff6864e14ddbc9dd564a9d44f
author: Jan Lindström
committer: Jan Lindström
timestamp: 2019-01-17 17:22:02 +0200
message:

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


 extra/mariabackup/CMakeLists.txt                   |  26 +-
 extra/mariabackup/backup_copy.cc                   | 130 ++++---
 extra/mariabackup/backup_mysql.cc                  | 100 +++---
 extra/mariabackup/changed_page_bitmap.cc           |  26 +-
 extra/mariabackup/common.h                         |  71 ++--
 extra/mariabackup/{datasink.c => datasink.cc}      |  11 +-
 extra/mariabackup/{ds_archive.c => ds_archive.cc}  |   0
 extra/mariabackup/{ds_buffer.c => ds_buffer.cc}    |   4 +-
 .../mariabackup/{ds_compress.c => ds_compress.cc}  |   8 +-
 extra/mariabackup/{ds_stdout.c => ds_stdout.cc}    |   2 +-
 extra/mariabackup/{ds_tmpfile.c => ds_tmpfile.cc}  |  22 +-
 .../mariabackup/{ds_xbstream.c => ds_xbstream.cc}  |  12 +-
 extra/mariabackup/encryption_plugin.cc             |   9 +-
 extra/mariabackup/fil_cur.cc                       |  32 +-
 extra/mariabackup/innobackupex.cc                  |   2 +-
 extra/mariabackup/write_filt.cc                    |  11 +-
 extra/mariabackup/wsrep.cc                         |   7 +-
 extra/mariabackup/{xbstream.c => xbstream.cc}      |  37 +-
 extra/mariabackup/xbstream.h                       |   2 +-
 .../{xbstream_read.c => xbstream_read.cc}          |  24 +-
 .../{xbstream_write.c => xbstream_write.cc}        |   6 +-
 extra/mariabackup/xtrabackup.cc                    | 385 +++++++++------------
 extra/mariabackup/xtrabackup.h                     |  14 +-
 include/json_lib.h                                 |   4 -
 include/mysql/plugin_audit.h.pp                    |  20 +-
 include/mysql/plugin_auth.h.pp                     |  20 +-
 include/mysql/plugin_encryption.h.pp               |  20 +-
 include/mysql/plugin_ftparser.h.pp                 |  20 +-
 include/mysql/plugin_password_validation.h.pp      |  20 +-
 include/mysql/service_json.h                       |  20 +-
 mysql-test/main/subselect_exists2in.result         |   4 +-
 mysql-test/main/union.result                       |  38 ++
 mysql-test/main/union.test                         |  35 ++
 mysql-test/main/view.result                        |   4 +-
 .../encryption/r/innodb-encryption-alter.result    |  28 +-
 .../encryption/t/innodb-encryption-alter.test      |  38 +-
 .../r/galera_FK_duplicate_client_insert.result     | 380 ++++++++++++++++++++
 .../t/galera_FK_duplicate_client_insert.test       | 161 +++++++++
 .../galera/t/galera_gtid_slave_sst_rsync.test      |   4 +
 .../suite/innodb/r/innodb-virtual-columns.result   |  13 +
 mysql-test/suite/innodb/r/instant_alter.result     |  50 ++-
 .../suite/innodb/t/innodb-virtual-columns.test     |  11 +
 mysql-test/suite/innodb/t/instant_alter.test       |  19 +
 .../sys_vars/r/sysvars_server_embedded.result      |   2 +-
 .../sys_vars/r/sysvars_server_notembedded.result   |   2 +-
 .../sys_vars/r/table_definition_cache_basic.result |  16 +-
 .../sys_vars/t/table_definition_cache_basic.test   |   6 +-
 mysys/safemalloc.c                                 |   4 +-
 sql/sql_acl.cc                                     |  30 +-
 sql/sql_class.cc                                   |  21 +-
 sql/sql_lex.cc                                     |   1 +
 sql/sys_vars.cc                                    |   8 +-
 storage/innobase/fil/fil0crypt.cc                  |  11 +-
 storage/innobase/handler/handler0alter.cc          |   8 +-
 storage/innobase/include/buf0buf.h                 |   6 +-
 storage/innobase/include/dict0mem.h                |  15 +-
 storage/innobase/include/fil0fil.h                 |   4 +-
 storage/innobase/include/univ.i                    |  11 +-
 storage/innobase/os/os0proc.cc                     |   3 -
 storage/innobase/row/row0ftsort.cc                 |  11 +-
 storage/innobase/row/row0ins.cc                    |   3 +-
 strings/json_lib.c                                 | 145 +++++---
 unittest/strings/CMakeLists.txt                    |   2 +-
 unittest/strings/json-t.c                          |  58 ++++
 64 files changed, 1494 insertions(+), 723 deletions(-)

diff --cc mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test
index a525a35ead3,3ed7ec1d09e..d03445d537a
--- a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test
+++ b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test
@@@ -181,15 -196,15 +181,19 @@@ DROP TABLE t2,t1
  --connection node_2
  STOP SLAVE;
  RESET SLAVE ALL;
 +set global wsrep_on=OFF;
 +reset master;
 +set global wsrep_on=ON;
++
+ --disable_warnings
  set global gtid_slave_pos="";
+ --enable_warnings
 -reset master;
 -
 ---echo #Connection 3
 ---connection node_3
 -reset master;
+ 
  --echo #Connection 1
  --connection node_1
 +set global wsrep_on=OFF;
 +reset master;
 +set global wsrep_on=ON;
 +--echo #Connection 3
 +--connection node_3
  reset master;


More information about the commits mailing list