revision-id: d8e6032fad0c93c4214c7abea7d6fd3209654475 (mariadb-10.4.28-76-gd8e6032) parent(s): c570e8bc2a8883167cf2f037ae9937c61d7ea07b fc6e8a3d3264078bed28632a289130b1dc24daea author: Igor Babaev committer: Igor Babaev timestamp: 2023-04-20 14:07:16 -0700 message: Merge branch '10.4' of github.com:MariaDB/server into 10.4 client/mysqltest.cc | 17 +- extra/mariabackup/backup_copy.cc | 169 ++++----- extra/mariabackup/backup_copy.h | 19 +- extra/mariabackup/backup_mysql.cc | 32 +- extra/mariabackup/backup_mysql.h | 15 +- extra/mariabackup/datasink.h | 29 ++ extra/mariabackup/write_filt.cc | 14 +- extra/mariabackup/write_filt.h | 3 +- extra/mariabackup/xtrabackup.cc | 225 ++++++----- extra/mariabackup/xtrabackup.h | 10 +- include/m_ctype.h | 25 +- include/m_string.h | 19 +- include/my_alloca.h | 6 +- mysql-test/include/ctype_nopad_prefix_unique.inc | 85 +++++ .../include/sql_mode_pad_char_to_full_length.inc | 31 ++ mysql-test/main/ctype_uca_partitions.result | 40 ++ mysql-test/main/ctype_uca_partitions.test | 32 ++ mysql-test/main/ctype_utf8_uca.result | 148 ++++++++ mysql-test/main/ctype_utf8_uca.test | 18 + mysql-test/main/func_str.result | 9 + mysql-test/main/func_str.test | 10 +- .../main/sql_mode_pad_char_to_full_length.result | 94 +++++ .../main/sql_mode_pad_char_to_full_length.test | 19 + mysql-test/main/status.test | 9 +- mysql-test/main/update.result | 29 ++ mysql-test/main/update.test | 23 ++ mysql-test/suite/galera/r/MDEV-30955.result | 26 ++ mysql-test/suite/galera/r/galera_sequences.result | 61 ++- mysql-test/suite/galera/r/mdev-26175.result | 24 ++ mysql-test/suite/galera/t/MDEV-30955.test | 70 ++++ mysql-test/suite/galera/t/galera_sequences.cnf | 9 + mysql-test/suite/galera/t/galera_sequences.test | 54 ++- mysql-test/suite/galera/t/mdev-26175.test | 27 ++ mysql-test/suite/galera_3nodes/galera_2x3nodes.cnf | 2 +- mysql-test/suite/galera_sr/r/MDEV-30862.result | 11 + mysql-test/suite/galera_sr/t/MDEV-30862.test | 24 ++ .../suite/innodb/r/default_row_format_alter.result | 20 + mysql-test/suite/innodb/r/innodb-wl5522.result | 14 + mysql-test/suite/innodb/r/innodb_ctype_utf8.result | 98 +++++ .../r/sql_mode_pad_char_to_full_length.result | 51 +++ .../suite/innodb/t/default_row_format_alter.test | 17 + .../suite/innodb/t/import_tablespace_race.test | 8 +- mysql-test/suite/innodb/t/innodb-wl5522.test | 21 +- mysql-test/suite/innodb/t/innodb_ctype_utf8.test | 12 + mysql-test/suite/innodb/t/restart.test | 23 +- .../innodb/t/sql_mode_pad_char_to_full_length.test | 18 + mysql-test/suite/maria/aria_log_dir_path.result | 29 ++ mysql-test/suite/maria/aria_log_dir_path.test | 65 ++++ mysql-test/suite/maria/maria3.result | 1 + .../sys_vars/r/aria_log_dir_path_basic.result | 36 ++ mysql-test/suite/sys_vars/r/sysvars_aria.result | 12 + .../sys_vars/r/sysvars_server_embedded.result | 10 + .../sys_vars/r/sysvars_server_notembedded.result | 10 + .../suite/sys_vars/t/aria_log_dir_path_basic.test | 35 ++ mysql-test/suite/sys_vars/t/sysvars_aria.test | 4 + mysys/my_addr_resolve.c | 7 +- scripts/wsrep_sst_mariabackup.sh | 3 + sql/debug_sync.cc | 2 +- sql/field.cc | 21 +- sql/field.h | 9 +- sql/handler.cc | 8 +- sql/item_strfunc.cc | 2 + sql/key.cc | 3 +- sql/log.cc | 2 +- sql/log_event.h | 2 +- sql/opt_range.cc | 3 + sql/sql_parse.cc | 2 +- sql/sql_select.cc | 18 +- sql/sql_table.cc | 13 + sql/wsrep_client_service.cc | 2 - sql/wsrep_high_priority_service.cc | 15 +- sql/wsrep_trans_observer.h | 15 +- storage/connect/reldef.cpp | 26 +- storage/connect/tabbson.cpp | 47 +-- storage/connect/tabdos.cpp | 61 +-- storage/connect/tabext.cpp | 55 +-- storage/connect/tabfmt.cpp | 38 +- storage/connect/tabjdbc.cpp | 45 +-- storage/connect/tabjson.cpp | 54 +-- storage/innobase/btr/btr0btr.cc | 2 +- storage/innobase/fts/fts0fts.cc | 10 +- storage/innobase/ibuf/ibuf0ibuf.cc | 4 + storage/innobase/rem/rem0cmp.cc | 3 +- storage/innobase/row/row0merge.cc | 5 - storage/maria/ha_maria.cc | 2 +- storage/rocksdb/build_rocksdb.cmake | 2 +- storage/spider/spd_table.cc | 3 + .../tokudb/PerconaFT/portability/toku_debug_sync.h | 9 +- strings/ctype-bin.c | 6 +- strings/ctype-simple.c | 3 +- strings/ctype-tis620.c | 3 +- strings/ctype-uca.inl | 27 +- strings/ctype.c | 6 +- strings/strcoll.inl | 3 +- strings/strings_def.h | 6 +- unittest/strings/strings-t.c | 420 +++++++++++---------- 96 files changed, 2196 insertions(+), 693 deletions(-)