[Commits] 56b03e308fb: Merge tag 'mariadb-10.0.32' into 10.0-galera

jan jan.lindstrom at mariadb.com
Wed Aug 9 08:56:14 EEST 2017


revision-id: 56b03e308fb4c0feee166ddf6a707d855affa3c3 (mariadb-galera-10.0.31-2-g56b03e308fb)
parent(s): 4f40f87c48a9ee252f797b5d760a6b6f07cc3815 a346a5613ee7c0b17b0b4ce377659c996ef6bb75
author: Jan Lindström
committer: Jan Lindström
timestamp: 2017-08-09 08:56:11 +0300
message:

Merge tag 'mariadb-10.0.32' into 10.0-galera


 CREDITS                                            |   24 +-
 client/mysql.cc                                    |  101 +-
 client/mysql_upgrade.c                             |    2 +
 client/mysqldump.c                                 |    5 +-
 client/mysqlimport.c                               |    2 +-
 client/mysqltest.cc                                |   45 +-
 cmake/cpack_rpm.cmake                              |    7 +-
 cmake/ssl.cmake                                    |    7 +-
 debian/compat                                      |    2 +-
 include/my_global.h                                |    7 +-
 include/my_sys.h                                   |    2 +-
 include/mysql_com.h                                |    2 +
 include/service_versions.h                         |    2 +-
 libmysql/libmysql.c                                |    5 +-
 mysql-test/include/innodb_page_size.combinations   |    8 +
 mysql-test/include/innodb_page_size.inc            |    4 +
 .../include/innodb_page_size_small.combinations    |    8 +
 mysql-test/include/innodb_page_size_small.inc      |    4 +
 .../include/wait_for_slave_sql_error_and_skip.inc  |    7 +
 mysql-test/mysql-test-run.pl                       |   37 +-
 mysql-test/r/alter_table_online.result             |  111 +
 mysql-test/r/binary_to_hex.result                  |  117 +
 mysql-test/r/contributors.result                   |    2 +
 mysql-test/r/count_distinct.result                 |   12 +
 mysql-test/r/ctype_ucs.result                      |   17 +
 mysql-test/r/engine_error_in_alter-8453.result     |    6 +
 mysql-test/r/func_concat.result                    |  113 +
 mysql-test/r/func_crypt.result                     |   18 +
 mysql-test/r/func_regexp_pcre.result               |   32 +
 mysql-test/r/gis-alter_table_online.result         |   51 +
 mysql-test/r/gis-rt-precise.result                 |   22 +
 mysql-test/r/gis.result                            |   26 +-
 mysql-test/r/group_by.result                       |   27 +
 mysql-test/r/join_outer.result                     |   95 +
 mysql-test/r/join_outer_jcl6.result                |   95 +
 mysql-test/r/loadxml.result                        |   16 +-
 mysql-test/r/myisam_debug.result                   |    2 +-
 mysql-test/r/mysql.result                          |   58 +
 mysql-test/r/mysql_upgrade.result                  |   23 +-
 mysql-test/r/mysqltest.result                      |    5 +
 mysql-test/r/read_only.result                      |    2 +
 mysql-test/r/subselect.result                      |   47 +-
 mysql-test/r/subselect_mat.result                  |   88 +
 mysql-test/r/subselect_mat_cost_bugs.result        |   17 +
 mysql-test/r/subselect_no_exists_to_in.result      |   47 +-
 mysql-test/r/subselect_no_mat.result               |   47 +-
 mysql-test/r/subselect_no_opts.result              |   47 +-
 mysql-test/r/subselect_no_scache.result            |   47 +-
 mysql-test/r/subselect_no_semijoin.result          |   47 +-
 mysql-test/r/subselect_nulls.result                |    6 +
 mysql-test/r/subselect_sj2_mat.result              |   22 +
 mysql-test/r/subselect_sj_mat.result               |   88 +
 mysql-test/r/union.result                          |   18 +
 mysql-test/r/view.result                           |   76 +
 mysql-test/std_data/loadxml.dat                    |    8 +-
 mysql-test/suite/archive/archive_gis.result        |    4 +-
 mysql-test/suite/binlog/r/binlog_unsafe.result     |   22 +-
 mysql-test/suite/binlog/t/binlog_unsafe.test       |   22 +-
 .../suite/innodb/r/drop_table_background.result    |    9 +
 mysql-test/suite/innodb/r/innodb-get-fk.result     |    2 +-
 mysql-test/suite/innodb/r/innodb_gis.result        |    4 +-
 .../suite/innodb/r/row_format_redundant.result     |   48 +
 mysql-test/suite/innodb/r/table_flags,4k.rdiff     |   83 +
 mysql-test/suite/innodb/r/table_flags,8k.rdiff     |   83 +
 mysql-test/suite/innodb/r/table_flags.result       |  175 +
 .../suite/innodb/t/drop_table_background.test      |   30 +
 mysql-test/suite/innodb/t/innodb-alter-debug.test  |    2 +-
 .../suite/innodb/t/innodb-alter-discard.test       |    2 +-
 .../suite/innodb/t/innodb-alter-nullable.test      |    2 +-
 mysql-test/suite/innodb/t/innodb-alter-table.test  |    2 +-
 .../suite/innodb/t/innodb-alter-tempfile.test      |    3 +-
 mysql-test/suite/innodb/t/innodb-get-fk.test       |    2 +-
 mysql-test/suite/innodb/t/log_file_size.test       |    8 +-
 .../suite/innodb/t/row_format_redundant.test       |   63 +
 mysql-test/suite/innodb/t/table_flags.test         |  190 +
 mysql-test/suite/innodb_zip/r/innodb-zip.result    |    2 -
 .../suite/innodb_zip/t/innodb-create-options.test  |    2 +-
 mysql-test/suite/innodb_zip/t/innodb-zip.test      |   11 +-
 mysql-test/suite/innodb_zip/t/innodb_bug36169.test |    2 +-
 mysql-test/suite/innodb_zip/t/innodb_bug36172.test |    2 +-
 mysql-test/suite/innodb_zip/t/innodb_bug52745.test |    2 +-
 mysql-test/suite/innodb_zip/t/innodb_bug53591.test |    2 +-
 mysql-test/suite/innodb_zip/t/innodb_bug56680.test |    2 +-
 mysql-test/suite/parts/r/longname.result           |   37 +
 mysql-test/suite/parts/r/quoting.result            |    6 +
 mysql-test/suite/parts/t/longname.test             |   32 +
 mysql-test/suite/parts/t/quoting.test              |   10 +
 mysql-test/suite/perfschema/t/privilege.test       |    1 -
 .../suite/roles/current_role_view-12666.result     |  103 +
 .../suite/roles/current_role_view-12666.test       |  102 +
 .../suite/roles/show_create_database-10463.result  |   65 +
 .../suite/roles/show_create_database-10463.test    |   55 +
 mysql-test/suite/rpl/r/circular_serverid0.result   |   30 +
 mysql-test/suite/rpl/r/rpl_reset_slave_fail.result |   29 +
 mysql-test/suite/rpl/t/circular_serverid0.cnf      |   30 +
 mysql-test/suite/rpl/t/circular_serverid0.test     |  104 +
 mysql-test/suite/rpl/t/rpl_reset_slave_fail.test   |   91 +
 .../suite/storage_engine/type_spatial.result       |    4 +-
 .../storage_engine/type_spatial_indexes.result     |    8 +-
 .../r/innodb_sched_priority_cleaner_basic.result   |    2 +-
 .../t/innodb_sched_priority_cleaner_basic.test     |   10 +-
 mysql-test/t/alter_table_online.test               |  165 +
 mysql-test/t/binary_to_hex.test                    |   76 +
 mysql-test/t/bootstrap.test                        |    6 +
 mysql-test/t/count_distinct.test                   |   16 +
 mysql-test/t/ctype_ucs.test                        |   16 +
 mysql-test/t/engine_error_in_alter-8453.test       |   11 +
 mysql-test/t/func_concat.test                      |   91 +
 mysql-test/t/func_crypt.test                       |   24 +
 mysql-test/t/func_regexp_pcre.test                 |   19 +
 mysql-test/t/gis-alter_table_online.test           |   82 +
 mysql-test/t/gis-rt-precise.test                   |   22 +
 mysql-test/t/gis.test                              |   25 +-
 mysql-test/t/group_by.test                         |   38 +
 mysql-test/t/join_outer.test                       |   82 +
 mysql-test/t/mysql.test                            |   30 +
 mysql-test/t/mysql_upgrade.test                    |   25 +-
 mysql-test/t/mysqltest.test                        |    8 +-
 mysql-test/t/read_only.test                        |    3 +
 mysql-test/t/subselect.test                        |   48 +
 mysql-test/t/subselect_mat_cost_bugs.test          |   16 +
 mysql-test/t/subselect_nulls.test                  |    6 +
 mysql-test/t/subselect_sj2_mat.test                |   20 +
 mysql-test/t/subselect_sj_mat.test                 |  207 +
 mysql-test/t/union.test                            |   15 +
 mysql-test/t/view.test                             |   65 +
 mysql-test/unstable-tests                          |  170 +-
 mysys/my_fopen.c                                   |    2 +-
 mysys/my_symlink.c                                 |    2 +-
 mysys/mysys_priv.h                                 |   11 +-
 mysys/stacktrace.c                                 |    2 +-
 pcre/ChangeLog                                     |   47 +
 pcre/NEWS                                          |    6 +
 pcre/configure.ac                                  |   12 +-
 pcre/doc/html/pcrejit.html                         |   57 +-
 pcre/doc/html/pcretest.html                        |    9 +-
 pcre/doc/pcre.txt                                  |   49 +-
 pcre/doc/pcrejit.3                                 |   54 +-
 pcre/doc/pcretest.1                                |   10 +-
 pcre/doc/pcretest.txt                              |    8 +-
 pcre/pcre_compile.c                                |   16 +-
 pcre/pcre_dfa_exec.c                               |    4 +-
 pcre/pcre_exec.c                                   |    2 +-
 pcre/pcre_internal.h                               |   11 +-
 pcre/pcre_jit_compile.c                            |  958 ++--
 pcre/pcre_scanner_unittest.cc                      |    1 +
 pcre/pcre_stringpiece.h.in                         |    4 +-
 pcre/pcre_stringpiece_unittest.cc                  |    1 +
 pcre/pcre_tables.c                                 |    4 +-
 pcre/pcre_ucd.c                                    |   14 +
 pcre/pcrecpp_unittest.cc                           |    1 +
 pcre/pcregrep.c                                    |   29 +-
 pcre/pcreposix.c                                   |    6 +-
 pcre/pcretest.c                                    |   17 +-
 pcre/testdata/testinput1                           |    3 +
 pcre/testdata/testinput12                          |    2 +
 pcre/testdata/testinput15                          |    3 +
 pcre/testdata/testinput8                           |    3 +
 pcre/testdata/testoutput1                          |    4 +
 pcre/testdata/testoutput12                         |    2 +
 pcre/testdata/testoutput15                         |    5 +
 pcre/testdata/testoutput8                          |    4 +
 plugin/semisync/semisync_master.cc                 |    6 +-
 scripts/CMakeLists.txt                             |   11 +-
 scripts/dheadgen.pl                                |    8 +-
 scripts/mysql_config.pl.in                         |    4 +-
 scripts/mysql_convert_table_format.sh              |    5 +-
 scripts/mysql_find_rows.sh                         |    5 +-
 scripts/mysql_fix_extensions.sh                    |    5 +-
 scripts/mysql_install_db.pl.in                     |    4 +-
 scripts/mysql_secure_installation.pl.in            |    7 +-
 scripts/mysql_setpermission.sh                     |    5 +-
 scripts/mysql_system_tables_fix.sql                |    9 +
 scripts/mysql_zap.sh                               |    5 +-
 scripts/mysqlaccess.sh                             |   19 +-
 scripts/mysqld_multi.sh                            |   22 +-
 scripts/mysqldumpslow.sh                           |    5 +-
 scripts/mysqlhotcopy.sh                            |    4 +-
 sql-common/client.c                                |    1 +
 sql/CMakeLists.txt                                 |   15 +-
 sql/contributors.h                                 |    2 +
 sql/field.cc                                       |   21 +-
 sql/field.h                                        |   10 +-
 sql/ha_partition.cc                                |  210 +-
 sql/handler.cc                                     |    4 +
 sql/item.cc                                        |   13 +-
 sql/item.h                                         |   35 +-
 sql/item_cmpfunc.cc                                |   15 +-
 sql/item_cmpfunc.h                                 |    2 +
 sql/item_func.cc                                   |    5 +-
 sql/item_func.h                                    |   29 +-
 sql/item_geofunc.cc                                |    2 +-
 sql/item_geofunc.h                                 |    2 -
 sql/item_strfunc.cc                                |  254 +-
 sql/item_strfunc.h                                 |   18 +-
 sql/item_subselect.cc                              |    6 +-
 sql/item_timefunc.cc                               |    2 +-
 sql/lock.cc                                        |   37 +-
 sql/log.cc                                         |    2 +-
 sql/multi_range_read.cc                            |   22 +-
 sql/mysqld.cc                                      |   10 +-
 sql/net_serv.cc                                    |    2 +-
 sql/opt_range.cc                                   |    9 +
 sql/opt_subselect.cc                               |    4 +
 sql/partition_info.cc                              |   14 +-
 sql/partition_info.h                               |    5 +-
 sql/records.cc                                     |    1 +
 sql/rpl_handler.cc                                 |    2 +-
 sql/rpl_mi.cc                                      |    6 +-
 sql/rpl_rli.cc                                     |   66 +-
 sql/rpl_rli.h                                      |   12 +-
 sql/slave.cc                                       |   39 +-
 sql/spatial.cc                                     |   27 +-
 sql/sql_class.cc                                   |   24 +-
 sql/sql_derived.cc                                 |    2 +
 sql/sql_load.cc                                    |    2 +-
 sql/sql_parse.cc                                   |   31 +-
 sql/sql_partition.cc                               |  158 +-
 sql/sql_partition.h                                |   12 +-
 sql/sql_partition_admin.cc                         |    8 +-
 sql/sql_plugin.cc                                  |   20 +-
 sql/sql_priv.h                                     |    2 +-
 sql/sql_repl.cc                                    |    6 +-
 sql/sql_select.cc                                  |   75 +-
 sql/sql_select.h                                   |    8 +
 sql/sql_show.cc                                    |   18 +-
 sql/sql_union.cc                                   |   18 +-
 sql/sys_vars.cc                                    |    4 +
 sql/threadpool_unix.cc                             |   14 +-
 sql/uniques.cc                                     |   16 +-
 storage/archive/ha_archive.cc                      |    1 -
 storage/connect/array.cpp                          |   12 +-
 storage/connect/blkfil.cpp                         |   10 +-
 storage/connect/colblk.cpp                         |   10 +-
 storage/connect/connect.cc                         |   11 +-
 storage/connect/connect.h                          |    3 +-
 storage/connect/engmsg.h                           |    1 +
 storage/connect/filter.cpp                         |   14 +-
 storage/connect/global.h                           |    4 +-
 storage/connect/ha_connect.cc                      |  166 +-
 storage/connect/ha_connect.h                       |    3 +-
 storage/connect/jdbconn.cpp                        |  143 +-
 storage/connect/json.cpp                           |  139 +-
 storage/connect/json.h                             |   36 +-
 storage/connect/jsonudf.cpp                        |   61 +-
 storage/connect/msgid.h                            |    1 +
 storage/connect/mycat.cc                           |    2 +-
 storage/connect/mycat.h                            |    4 +-
 .../mysql-test/connect/r/drop-open-error.result    |   14 +
 storage/connect/mysql-test/connect/r/grant2.result |    3 +-
 .../mysql-test/connect/r/infoschema-9739.result    |   12 +
 .../connect/mysql-test/connect/r/json_udf.result   |    2 +-
 .../connect/mysql-test/connect/r/mysql_new.result  |    2 +-
 .../mysql-test/connect/r/odbc_firebird.result      |  165 +
 .../mysql-test/connect/std_data/mdev9949.frm       |  Bin 0 -> 35031 bytes
 .../mysql-test/connect/t/drop-open-error.opt       |    1 +
 .../mysql-test/connect/t/drop-open-error.test      |   31 +
 storage/connect/mysql-test/connect/t/grant2.test   |    1 +
 .../mysql-test/connect/t/infoschema-9739.test      |    9 +
 .../connect/mysql-test/connect/t/mysql_new.test    |    2 +-
 .../mysql-test/connect/t/odbc_firebird.test        |   35 +
 .../mysql-test/connect/t/secure_file_priv.test     |    2 +-
 storage/connect/noconst.c                          |   38 +
 storage/connect/os.h                               |    1 +
 storage/connect/osutil.c                           |    1 +
 storage/connect/osutil.h                           |    1 +
 storage/connect/plgdbsem.h                         |    2 -
 storage/connect/plgdbutl.cpp                       |   22 +-
 storage/connect/plugutil.cpp                       |  102 +-
 storage/connect/tabcol.cpp                         |    8 +-
 storage/connect/tabdos.cpp                         |  178 +-
 storage/connect/tabjson.cpp                        |   32 +-
 storage/connect/table.cpp                          |    2 +-
 storage/connect/tabodbc.cpp                        |    4 +-
 storage/connect/tabodbc.h                          |    2 +-
 storage/connect/tabvir.cpp                         |    2 +-
 storage/connect/tabxml.cpp                         |   40 +-
 storage/connect/user_connect.cc                    |   37 +-
 storage/connect/user_connect.h                     |    5 +-
 storage/connect/value.cpp                          |   71 +-
 storage/connect/value.h                            |    4 +-
 storage/connect/xindex.cpp                         |   20 +-
 storage/connect/xobject.cpp                        |   10 +-
 storage/federated/ha_federated.cc                  |    2 +
 storage/federatedx/ha_federatedx.cc                |    2 +
 storage/heap/hp_extra.c                            |    1 +
 storage/innobase/api/api0api.cc                    |   21 +-
 storage/innobase/buf/buf0buf.cc                    |    6 -
 storage/innobase/buf/buf0flu.cc                    |    8 +-
 storage/innobase/dict/dict0crea.cc                 |    1 +
 storage/innobase/dict/dict0dict.cc                 |   57 +-
 storage/innobase/dict/dict0stats_bg.cc             |   35 +-
 storage/innobase/fsp/fsp0fsp.cc                    |   11 -
 storage/innobase/handler/ha_innodb.cc              |   50 +-
 storage/innobase/handler/ha_innodb.h               |    6 +-
 storage/innobase/include/buf0flu.h                 |    2 +-
 storage/innobase/include/dict0dict.h               |   10 +-
 storage/innobase/include/dict0stats_bg.h           |    6 +-
 storage/innobase/include/row0mysql.h               |    7 +-
 storage/innobase/include/row0sel.h                 |   14 +-
 storage/innobase/include/srv0srv.h                 |    2 +-
 storage/innobase/include/srv0start.h               |   20 +-
 storage/innobase/include/univ.i                    |    2 +-
 storage/innobase/log/log0log.cc                    |   95 +-
 .../storage_engine/type_spatial_indexes.rdiff      |    4 +-
 storage/innobase/row/row0merge.cc                  |    6 +-
 storage/innobase/row/row0sel.cc                    |   85 +-
 storage/innobase/srv/srv0srv.cc                    |  220 +-
 storage/innobase/srv/srv0start.cc                  |  127 +-
 storage/innobase/trx/trx0purge.cc                  |   13 +
 storage/maria/ma_check.c                           |    4 +-
 storage/maria/ma_key_recover.c                     |    1 +
 storage/maria/ma_loghandler.c                      |    4 +-
 storage/maria/ma_pagecache.c                       |    1 +
 storage/maria/ma_recovery.c                        |    4 +-
 storage/mroonga/mrn_table.cpp                      |   14 +-
 storage/myisam/mi_check.c                          |    4 +-
 .../mysql-test/storage_engine/parts/disabled.def   |    0
 .../mysql-test/storage_engine/type_spatial.rdiff   |    4 +-
 .../storage_engine/type_spatial_indexes.rdiff      |    8 +-
 storage/spider/mysql-test/spider/bg/suite.pm       |    1 +
 storage/spider/mysql-test/spider/suite.pm          |    3 +-
 storage/spider/spd_table.cc                        |   29 +-
 storage/tokudb/CMakeLists.txt                      |    2 +-
 storage/tokudb/PerconaFT/CMakeLists.txt            |   10 +
 storage/tokudb/PerconaFT/buildheader/make_tdb.cc   |    5 +-
 .../PerconaFT/cmake_modules/TokuThirdParty.cmake   |    3 +
 .../tokudb/PerconaFT/ft/cachetable/cachetable.cc   |    9 +-
 .../tokudb/PerconaFT/ft/cachetable/cachetable.h    |    3 +
 storage/tokudb/PerconaFT/ft/ft-ops.cc              |   97 +-
 storage/tokudb/PerconaFT/ft/ft.cc                  |    3 +-
 storage/tokudb/PerconaFT/ft/node.cc                |   19 +-
 storage/tokudb/PerconaFT/ft/node.h                 |   20 +-
 .../tokudb/PerconaFT/ft/serialize/ft-serialize.cc  |   43 +-
 .../tokudb/PerconaFT/ft/serialize/ft-serialize.h   |   23 +-
 .../PerconaFT/ft/serialize/ft_node-serialize.cc    |  689 ++-
 .../PerconaFT/ft/serialize/ft_node-serialize.h     |   69 +-
 storage/tokudb/PerconaFT/ft/txn/roll.cc            |    2 +-
 storage/tokudb/PerconaFT/ft/txn/txn.cc             |    9 +-
 storage/tokudb/PerconaFT/ft/txn/txn.h              |    5 +-
 storage/tokudb/PerconaFT/locktree/lock_request.cc  |  150 +-
 storage/tokudb/PerconaFT/locktree/lock_request.h   |   23 +-
 storage/tokudb/PerconaFT/locktree/locktree.cc      |   44 +-
 storage/tokudb/PerconaFT/locktree/locktree.h       |   33 +-
 storage/tokudb/PerconaFT/locktree/manager.cc       |   13 +
 .../tokudb/PerconaFT/locktree/tests/kill_waiter.cc |  100 +
 .../locktree/tests/lock_request_killed.cc          |    3 +-
 .../locktree/tests/lock_request_not_killed.cc      |    1 -
 .../tests/lock_request_start_release_wait.cc       |   91 +
 .../tests/lock_request_start_retry_race.cc         |  121 +-
 .../tests/lock_request_start_retry_race_3.cc       |  133 +
 .../tests/lock_request_start_retry_wait_race_2.cc  |  135 +
 .../tokudb/PerconaFT/portability/toku_debug_sync.h |   77 +
 .../PerconaFT/portability/toku_portability.h       |    3 +
 .../src/tests/test_iterate_live_transactions.cc    |    9 +-
 storage/tokudb/PerconaFT/src/tests/test_stress0.cc |    3 +-
 .../PerconaFT/src/tests/transactional_fileops.cc   |    9 +
 storage/tokudb/PerconaFT/src/ydb.cc                |   38 +-
 storage/tokudb/PerconaFT/src/ydb_row_lock.cc       |   22 +-
 storage/tokudb/PerconaFT/src/ydb_txn.cc            |    8 +-
 storage/tokudb/PerconaFT/tools/CMakeLists.txt      |    8 +
 storage/tokudb/PerconaFT/tools/ftverify.cc         |    2 +-
 storage/tokudb/PerconaFT/tools/tokuftdump.cc       |    3 +-
 storage/tokudb/ha_tokudb.cc                        |  124 +-
 storage/tokudb/ha_tokudb.h                         |   41 +-
 storage/tokudb/hatoku_hton.cc                      |    9 +
 .../include/rpl_tokudb_row_img_general_loop.inc    |   42 +
 ...pl_parallel_tokudb_update_pk_uc0_lookup0.result |    6 +-
 .../rpl/r/rpl_parallel_tokudb_write_pk.result      |    1 -
 .../r/rpl_rfr_disable_on_expl_pk_absence.result    |    3 -
 .../rpl/r/rpl_tokudb_commit_after_flush.result     |   10 +
 .../mysql-test/rpl/r/rpl_tokudb_insert_id.result   |  530 +++
 .../rpl/r/rpl_tokudb_insert_id_pk.result           |   74 +
 .../rpl/r/rpl_tokudb_multi_update.result           |   25 +
 .../rpl/r/rpl_tokudb_multi_update2.result          |   53 +
 .../rpl/r/rpl_tokudb_multi_update3.result          |  195 +
 .../r/rpl_tokudb_rfr_partition_table.result        |    0
 .../rpl/r/rpl_tokudb_row_crash_safe.result         | 2183 +++++++++
 .../rpl/r/rpl_tokudb_row_img_blobs.result          | 4739 ++++++++++++++++++++
 .../rpl/r/rpl_tokudb_row_img_eng_full.result       | 3681 +++++++++++++++
 .../rpl/r/rpl_tokudb_row_img_eng_min.result        | 3522 +++++++++++++++
 .../rpl/r/rpl_tokudb_row_img_eng_noblob.result     | 3522 +++++++++++++++
 .../rpl/r/rpl_tokudb_row_img_idx_full.result       | 3505 +++++++++++++++
 .../rpl/r/rpl_tokudb_row_img_idx_min.result        | 3530 +++++++++++++++
 .../rpl/r/rpl_tokudb_row_img_idx_noblob.result     | 3530 +++++++++++++++
 .../mysql-test/rpl/r/rpl_tokudb_row_log.result     |  293 ++
 .../r/rpl_tokudb_row_lower_case_table_names.result |   51 +
 .../mysql-test/rpl/r/rpl_tokudb_row_sp003.result   |   54 +
 .../mysql-test/rpl/r/rpl_tokudb_row_sp006.result   |   41 +
 .../mysql-test/rpl/r/rpl_tokudb_row_trig004.result |   27 +
 .../mysql-test/rpl/r/rpl_tokudb_stm_log.result     |  292 ++
 .../rpl/r/rpl_tokudb_stm_mixed_crash_safe.result   | 1773 ++++++++
 ..._tokudb_stm_mixed_lower_case_table_names.result |   48 +
 .../mysql-test/rpl/t/rpl_deadlock_tokudb.test      |    1 +
 .../mysql-test/rpl/t/rpl_not_null_tokudb.test      |    2 +-
 .../rpl/t/rpl_parallel_tokudb_delete_pk-slave.opt  |    7 +-
 ...parallel_tokudb_update_pk_uc0_lookup0-slave.opt |    6 +-
 .../rpl_parallel_tokudb_update_pk_uc0_lookup0.test |    7 +-
 .../rpl/t/rpl_parallel_tokudb_write_pk-slave.opt   |    5 +-
 .../rpl/t/rpl_parallel_tokudb_write_pk.test        |    4 +-
 .../t/rpl_rfr_disable_on_expl_pk_absence-slave.opt |    0
 .../t/rpl_rfr_disable_on_expl_pk_absence.test      |    0
 .../mysql-test/rpl/t/rpl_row_basic_3tokudb.test    |   12 +-
 .../tokudb/mysql-test/rpl/t/rpl_stm_tokudb.test    |    1 +
 .../rpl/t/rpl_tokudb_commit_after_flush.test       |    6 +
 .../rpl/t/rpl_tokudb_insert_id-master.opt          |    0
 .../rpl/t/rpl_tokudb_insert_id-slave.opt           |    0
 .../mysql-test/rpl/t/rpl_tokudb_insert_id.test     |    7 +
 .../mysql-test/rpl/t/rpl_tokudb_insert_id_pk.test  |    7 +
 .../mysql-test/rpl/t/rpl_tokudb_multi_update.test  |    4 +
 .../rpl/t/rpl_tokudb_multi_update2-slave.opt       |    1 +
 .../mysql-test/rpl/t/rpl_tokudb_multi_update2.test |   13 +
 .../mysql-test/rpl/t/rpl_tokudb_multi_update3.test |   13 +
 .../t/rpl_tokudb_rfr_partition_table-slave.opt     |    0
 .../t/rpl_tokudb_rfr_partition_table.test          |    2 +
 .../rpl/t/rpl_tokudb_row_crash_safe-master.opt     |    1 +
 .../rpl/t/rpl_tokudb_row_crash_safe-slave.opt      |    1 +
 .../rpl/t/rpl_tokudb_row_crash_safe.test           |   19 +
 .../mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test |   54 +
 .../rpl/t/rpl_tokudb_row_img_eng_full.test         |   51 +
 .../rpl/t/rpl_tokudb_row_img_eng_min.test          |   43 +
 .../rpl/t/rpl_tokudb_row_img_eng_noblob.test       |   43 +
 .../rpl/t/rpl_tokudb_row_img_idx_full.test         |   39 +
 .../rpl/t/rpl_tokudb_row_img_idx_min.test          |   42 +
 .../rpl/t/rpl_tokudb_row_img_idx_noblob.test       |   42 +
 .../mysql-test/rpl/t/rpl_tokudb_row_log-master.opt |    2 +
 .../mysql-test/rpl/t/rpl_tokudb_row_log.test       |   15 +
 ...rpl_tokudb_row_lower_case_table_names-slave.opt |    1 +
 .../t/rpl_tokudb_row_lower_case_table_names.test   |   15 +
 .../mysql-test/rpl/t/rpl_tokudb_row_sp003.test     |   14 +
 .../mysql-test/rpl/t/rpl_tokudb_row_sp006.test     |   14 +
 .../mysql-test/rpl/t/rpl_tokudb_row_trig004.test   |   19 +
 .../mysql-test/rpl/t/rpl_tokudb_stm_log-master.opt |    2 +
 .../mysql-test/rpl/t/rpl_tokudb_stm_log.test       |   15 +
 .../t/rpl_tokudb_stm_mixed_crash_safe-master.opt   |    1 +
 .../t/rpl_tokudb_stm_mixed_crash_safe-slave.opt    |    1 +
 .../rpl/t/rpl_tokudb_stm_mixed_crash_safe.test     |   18 +
 ...kudb_stm_mixed_lower_case_table_names-slave.opt |    1 +
 ...pl_tokudb_stm_mixed_lower_case_table_names.test |   14 +
 .../tokudb/r/kill_query_blocked_in_lt.result       |   26 +
 .../tokudb/r/locks-select-update-3.result          |    6 +-
 .../tokudb/t/kill_query_blocked_in_lt.test         |   57 +
 .../mysql-test/tokudb/t/locks-select-update-3.test |   11 +-
 .../tokudb_backup/r/rpl_safe_slave.result          |    2 -
 .../mysql-test/tokudb_backup/t/rpl_safe_slave.inc  |    3 -
 .../mysql-test/tokudb_mariadb/r/mdev12972.result   |   19 +
 .../mysql-test/tokudb_mariadb/t/mdev12972.test     |   26 +
 storage/tokudb/tokudb_information_schema.cc        |    6 +-
 storage/tokudb/tokudb_txn.h                        |    2 +-
 storage/xtradb/buf/buf0buf.cc                      |    6 -
 storage/xtradb/buf/buf0flu.cc                      |   28 +-
 storage/xtradb/dict/dict0dict.cc                   |   57 +-
 storage/xtradb/dict/dict0stats_bg.cc               |   35 +-
 storage/xtradb/fsp/fsp0fsp.cc                      |   11 -
 storage/xtradb/handler/ha_innodb.cc                |   37 +-
 storage/xtradb/handler/xtradb_i_s.cc               |    5 +-
 storage/xtradb/include/buf0flu.h                   |    2 +-
 storage/xtradb/include/dict0dict.h                 |   10 +-
 storage/xtradb/include/dict0stats_bg.h             |    6 +-
 storage/xtradb/include/srv0srv.h                   |    2 +-
 storage/xtradb/include/srv0start.h                 |   20 +-
 storage/xtradb/include/univ.i                      |    2 +-
 storage/xtradb/log/log0log.cc                      |   97 +-
 .../storage_engine/type_spatial_indexes.rdiff      |    4 +-
 storage/xtradb/os/os0file.cc                       |    2 +-
 storage/xtradb/srv/srv0srv.cc                      |  228 +-
 storage/xtradb/srv/srv0start.cc                    |  138 +-
 storage/xtradb/trx/trx0purge.cc                    |   13 +
 468 files changed, 41872 insertions(+), 3201 deletions(-)

diff --cc cmake/cpack_rpm.cmake
index 00f21c1cd8b,e5206d9690c..4764e7a873f
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@@ -24,9 -24,17 +24,14 @@@ SET(CPACK_COMPONENT_COMMON_GROUP "commo
  SET(CPACK_COMPONENT_CLIENTPLUGINS_GROUP "common")
  SET(CPACK_COMPONENT_COMPAT_GROUP "compat")
  SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts
 -                         SupportFiles Development ManPagesDevelopment
 -                         ManPagesTest Readme ManPagesClient Test 
 -                         Common Client SharedLibraries ClientPlugins)
 -
 -SET(CPACK_RPM_PACKAGE_NAME "MariaDB")
 +                         SupportFiles Readme Test)
 +SET(CPACK_RPM_PACKAGE_NAME "MariaDB-Galera")
- SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")
+ IF(CMAKE_VERSION VERSION_LESS "3.6.0")
+   SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")
+ ELSE()
+   SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
+   SET(CPACK_RPM_DEBUGINFO_PACKAGE ON)
+ ENDIF()
  
  SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}")
  SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
diff --cc storage/innobase/srv/srv0start.cc
index 98c4e37d9dd,789fe50d337..62605262de5
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@@ -2894,19 -2898,6 +2907,13 @@@ files_checked
  		/* Create the buffer pool dump/load thread */
  		buf_dump_thread_handle = os_thread_create(buf_dump_thread, NULL, NULL);
  		buf_dump_thread_started = true;
 +#ifdef WITH_WSREP
 +		} else {
 +			ib_logf(IB_LOG_LEVEL_WARN,
 +			"Skipping buffer pool dump/restore during wsrep "
 +			"recovery.");
 +                }
 +#endif /* WITH_WSREP */
- 		/* Create the dict stats gathering thread */
- 		dict_stats_thread_handle = os_thread_create(dict_stats_thread, NULL, NULL);
- 		dict_stats_thread_started = true;
- 
- 		/* Create the thread that will optimize the FTS sub-system. */
- 		fts_optimize_init();
  	}
  
  	srv_was_started = TRUE;
diff --cc storage/xtradb/srv/srv0start.cc
index 4192e0f0640,f12f895488d..63d92f37a52
--- a/storage/xtradb/srv/srv0start.cc
+++ b/storage/xtradb/srv/srv0start.cc
@@@ -2982,19 -2989,6 +2998,13 @@@ files_checked
  		/* Create the buffer pool dump/load thread */
  		buf_dump_thread_handle = os_thread_create(buf_dump_thread, NULL, NULL);
  		buf_dump_thread_started = true;
 +#ifdef WITH_WSREP
 +		} else {
 +			ib_logf(IB_LOG_LEVEL_WARN,
 +			"Skipping buffer pool dump/restore during wsrep "
 +			"recovery.");
 +                }
 +#endif /* WITH_WSREP */
- 		/* Create the dict stats gathering thread */
- 		dict_stats_thread_handle = os_thread_create(dict_stats_thread, NULL, NULL);
- 		dict_stats_thread_started = true;
- 
- 		/* Create the thread that will optimize the FTS sub-system. */
- 		fts_optimize_init();
  	}
  
  	srv_was_started = TRUE;


More information about the commits mailing list