[Commits] b8aafca: Merge branch '10.1' into bb-10.1-jan

Jan Lindström jan.lindstrom at mariadb.com
Wed Nov 4 15:15:20 EET 2015


revision-id: b8aafca1991e43aa95420471c530e05a28e2920b (mariadb-10.1.5-34-gb8aafca)
parent(s): d3388cf3466f504db7ebcc99b62d0a4556881417 e771edfa0df6ec8f1587230f7959da031250b6c3
committer: Jan Lindström
timestamp: 2015-11-04 15:15:16 +0200
message:

Merge branch '10.1' into bb-10.1-jan

Conflicts:
	storage/xtradb/fil/fil0pagecompress.cc


 .gitattributes                                     |    1 +
 .gitignore                                         |    6 +
 BUILD/SETUP.sh                                     |    2 +-
 BUILD/compile-solaris-amd64                        |    2 +-
 CMakeLists.txt                                     |    4 +-
 VERSION                                            |    2 +-
 client/CMakeLists.txt                              |    3 +-
 client/mysql_upgrade.c                             |    3 +-
 client/mysqlbinlog.cc                              |   11 +-
 client/mysqlimport.c                               |   12 +-
 client/mysqlslap.c                                 |   49 +-
 client/mysqltest.cc                                |   12 +-
 cmake/check_compiler_flag.cmake                    |   14 +-
 cmake/configure.pl                                 |    2 +-
 cmake/cpack_rpm.cmake                              |    1 +
 cmake/install_layout.cmake                         |    6 +-
 cmake/maintainer.cmake                             |    4 +-
 cmake/os/Windows.cmake                             |   10 +-
 cmake/ssl.cmake                                    |    1 -
 cmake/systemd.cmake                                |   83 +
 config.h.cmake                                     |    3 +
 configure.cmake                                    |   25 +-
 debian/README.Maintainer                           |  111 -
 debian/additions/my.cnf                            |    4 +
 debian/additions/mysql-server.lintian-overrides    |    2 -
 debian/additions/mysqld_safe_syslog.cnf            |    1 +
 debian/apparmor-profile                            |   15 +
 debian/autobake-deb.sh                             |   40 +-
 debian/control                                     |  431 ++
 debian/copyright                                   |   16 +-
 debian/dist/Debian/control                         |  296 --
 .../dist/Debian/mariadb-server-10.1.README.Debian  |  109 -
 debian/dist/Debian/mariadb-server-10.1.dirs        |   10 -
 debian/dist/Debian/mariadb-server-10.1.files.in    |   94 -
 debian/dist/Debian/mariadb-server-10.1.postinst    |  269 --
 debian/dist/Debian/mariadb-server-10.1.postrm      |   83 -
 debian/dist/Debian/rules                           |  285 --
 debian/dist/Ubuntu/apparmor-profile                |   15 -
 debian/dist/Ubuntu/control                         |  296 --
 .../dist/Ubuntu/mariadb-server-10.1.README.Debian  |  109 -
 debian/dist/Ubuntu/mariadb-server-10.1.dirs        |   10 -
 debian/dist/Ubuntu/mariadb-server-10.1.files.in    |   96 -
 debian/dist/Ubuntu/mariadb-server-10.1.postinst    |  285 --
 debian/dist/Ubuntu/mariadb-server-10.1.postrm      |   86 -
 debian/dist/Ubuntu/mariadb-server-10.1.py          |   52 -
 debian/dist/Ubuntu/rules                           |  290 --
 debian/mariadb-client-10.1.files                   |    1 -
 debian/mariadb-client-10.1.lintian-overrides       |    3 -
 debian/mariadb-server-10.1.NEWS                    |   34 -
 debian/mariadb-server-10.1.README.Debian           |  106 +
 debian/mariadb-server-10.1.dirs                    |   10 +
 debian/mariadb-server-10.1.files.in                |   96 +
 debian/mariadb-server-10.1.lintian-overrides       |    5 -
 debian/mariadb-server-10.1.postinst                |  297 ++
 debian/mariadb-server-10.1.postrm                  |   86 +
 debian/mariadb-server-10.1.py                      |   52 +
 debian/mysql-common.files                          |    1 -
 debian/mysql-common.lintian-overrides              |    2 -
 debian/rules                                       |  287 ++
 debian/source.lintian-overrides                    |    2 -
 debian/watch                                       |    3 -
 extra/innochecksum.cc                              |  172 +-
 extra/yassl/README                                 |   29 +
 extra/yassl/include/openssl/ssl.h                  |    2 +-
 extra/yassl/include/yassl_error.hpp                |    3 +-
 extra/yassl/src/buffer.cpp                         |    2 +-
 extra/yassl/src/handshake.cpp                      |    2 +
 extra/yassl/src/ssl.cpp                            |   31 +-
 extra/yassl/src/yassl_error.cpp                    |    4 +
 extra/yassl/src/yassl_imp.cpp                      |   15 +-
 extra/yassl/taocrypt/src/asn.cpp                   |    9 +-
 extra/yassl/taocrypt/src/rsa.cpp                   |    4 +
 extra/yassl/testsuite/cipher-test.sh               |    1 +
 include/m_ctype.h                                  |   20 +-
 include/maria.h                                    |    2 +-
 include/my_alarm.h                                 |    2 +-
 include/my_base.h                                  |   12 +-
 include/my_crypt.h                                 |   82 +-
 include/my_dbug.h                                  |    4 +-
 include/my_getopt.h                                |    6 +-
 include/my_global.h                                |   15 +-
 include/my_handler_errors.h                        |    3 +-
 include/my_pthread.h                               |    8 +-
 include/my_sys.h                                   |   35 +-
 include/my_systemd.h                               |   34 +
 include/mysql.h                                    |    4 +-
 include/mysql.h.pp                                 |    6 +-
 include/mysql/plugin_audit.h.pp                    |   49 +-
 include/mysql/plugin_auth.h.pp                     |   49 +-
 include/mysql/plugin_encryption.h                  |   51 +-
 include/mysql/plugin_encryption.h.pp               |   60 +-
 include/mysql/plugin_ftparser.h.pp                 |   49 +-
 include/mysql/plugin_password_validation.h.pp      |   49 +-
 include/mysql/psi/mysql_socket.h                   |   28 +-
 include/mysql/service_encryption.h                 |   86 +-
 include/mysql/service_wsrep.h                      |   14 +-
 include/mysql_com.h                                |    9 +-
 include/service_versions.h                         |    2 +-
 libmysqld/CMakeLists.txt                           |    2 +
 libmysqld/lib_sql.cc                               |    1 +
 man/aria_chk.1                                     |    3 +-
 man/aria_dump_log.1                                |    5 +-
 man/aria_ftdump.1                                  |    3 +-
 man/aria_pack.1                                    |    3 +-
 man/aria_read_log.1                                |    3 +-
 man/comp_err.1                                     |   23 +-
 man/innochecksum.1                                 |   42 +-
 man/make_win_bin_dist.1                            |   17 +-
 man/msql2mysql.1                                   |   17 +-
 man/my_print_defaults.1                            |   41 +-
 man/myisam_ftdump.1                                |   17 +-
 man/myisamchk.1                                    |  185 +-
 man/myisamlog.1                                    |   17 +-
 man/myisampack.1                                   |   19 +-
 man/mysql-stress-test.pl.1                         |   23 +-
 man/mysql-test-run.pl.1                            |  537 ++-
 man/mysql.1                                        |  497 +-
 man/mysql.server.1                                 |   44 +-
 man/mysql_client_test.1                            |   25 +-
 man/mysql_config.1                                 |   39 +-
 man/mysql_convert_table_format.1                   |   26 +-
 man/mysql_find_rows.1                              |   17 +-
 man/mysql_fix_extensions.1                         |   17 +-
 man/mysql_install_db.1                             |  154 +-
 man/mysql_plugin.1                                 |   37 +-
 man/mysql_secure_installation.1                    |   21 +-
 man/mysql_setpermission.1                          |   35 +-
 man/mysql_tzinfo_to_sql.1                          |   20 +-
 man/mysql_upgrade.1                                |  450 +-
 man/mysql_waitpid.1                                |   17 +-
 man/mysql_zap.1                                    |   17 +-
 man/mysqlaccess.1                                  |   28 +-
 man/mysqladmin.1                                   |  220 +-
 man/mysqlbinlog.1                                  |  264 +-
 man/mysqlbug.1                                     |   25 +-
 man/mysqlcheck.1                                   |  320 +-
 man/mysqld.8                                       |   34 +-
 man/mysqld_multi.1                                 |  123 +-
 man/mysqld_safe.1                                  |  202 +-
 man/mysqldump.1                                    |  588 ++-
 man/mysqldumpslow.1                                |   26 +-
 man/mysqlhotcopy.1                                 |   39 +-
 man/mysqlimport.1                                  |  223 +-
 man/mysqlshow.1                                    |  225 +-
 man/mysqlslap.1                                    |  327 +-
 man/mysqltest.1                                    |  363 +-
 man/perror.1                                       |   19 +-
 man/replace.1                                      |   17 +-
 man/resolve_stack_dump.1                           |   17 +-
 man/resolveip.1                                    |   17 +-
 mysql-test/disabled.def                            |    3 +-
 .../binlog_tests/mix_innodb_myisam_binlog.test     |    2 +-
 .../extra/binlog_tests/mysqlbinlog_row_engine.inc  |    3 +-
 mysql-test/extra/rpl_tests/rpl_ddl.test            |    4 +
 .../extra/rpl_tests/rpl_extra_col_slave.test       |    3 +-
 .../rpl_tests/rpl_implicit_commit_binlog.test      |    6 +-
 mysql-test/extra/rpl_tests/rpl_row_img.test        |  241 +
 mysql-test/extra/rpl_tests/rpl_row_img_blobs.test  |  179 +
 mysql-test/include/binlog_start_pos.inc            |   10 +-
 mysql-test/include/check-warnings.test             |    4 +
 mysql-test/include/concurrent.inc                  |    2 +
 mysql-test/include/ctype_innodb_like.inc           |    7 +
 mysql-test/include/ctype_like_cond_propagation.inc |   16 +
 mysql-test/include/ctype_numconv.inc               |    4 +-
 mysql-test/include/ctype_utf8_ilseq.inc            |   18 +
 mysql-test/include/ctype_utf8mb4.inc               |   37 +-
 .../include/equal_fields_propagation_datetime.inc  |   64 +
 mysql-test/include/explain_non_select.inc          |    2 +-
 mysql-test/include/func_hybrid_type.inc            |   81 +
 mysql-test/include/grant_cache.inc                 |    8 +
 mysql-test/include/icp_tests.inc                   |   14 +-
 mysql-test/include/mix2.inc                        |   10 +-
 mysql-test/include/mtr_warnings.sql                |    3 +
 mysql-test/include/ps_create.inc                   |    3 +-
 mysql-test/include/query_cache.inc                 |    4 +
 mysql-test/include/query_cache_partitions.inc      |    3 +
 mysql-test/include/query_cache_sql_prepare.inc     |    3 +
 mysql-test/include/restart_mysqld.inc              |   20 +-
 mysql-test/include/rpl_row_img_general_loop.inc    |   42 +
 mysql-test/include/rpl_row_img_set.inc             |   55 +
 mysql-test/include/show_binlog_events2.inc         |    2 +-
 mysql-test/include/show_events.inc                 |   16 +-
 mysql-test/include/show_relaylog_events.inc        |    3 +-
 mysql-test/include/sync_with_master_gtid.inc       |    4 +
 mysql-test/include/type_hrtime.inc                 |   14 +-
 mysql-test/include/wait_until_ready.inc            |   34 +
 mysql-test/lib/My/SafeProcess/safe_process.cc      |   22 +-
 mysql-test/mysql-test-run.pl                       |   48 +-
 mysql-test/r/alter_table.result                    |   13 +-
 mysql-test/r/alter_table_online.result             |  114 +
 mysql-test/r/analyze_format_json.result            |  300 +-
 mysql-test/r/analyze_stmt_orderby.result           |   58 +-
 mysql-test/r/analyze_stmt_privileges.result        |    1 +
 mysql-test/r/analyze_stmt_privileges2.result       |    3 +
 mysql-test/r/bigint.result                         |    8 +-
 mysql-test/r/blackhole_plugin.result               |    4 +-
 mysql-test/r/bug13633383.result                    |   61 +
 mysql-test/r/cache_innodb.result                   |    3 +
 mysql-test/r/case.result                           |  171 +-
 mysql-test/r/cast.result                           |   38 +-
 mysql-test/r/change_user.result                    |    9 +-
 mysql-test/r/compare.result                        |    2 +-
 mysql-test/r/compound.result                       |    2 +-
 mysql-test/r/concurrent_innodb_safelog.result      |    2 +
 mysql-test/r/concurrent_innodb_unsafelog.result    |    2 +
 mysql-test/r/connect.result                        |    3 +
 mysql-test/r/create-big.result                     |   12 +-
 mysql-test/r/create.result                         |   36 +-
 mysql-test/r/create_drop_binlog.result             |   65 +-
 mysql-test/r/create_drop_function.result           |    2 +-
 mysql-test/r/create_drop_role.result               |    8 +-
 mysql-test/r/create_drop_user.result               |    6 +-
 mysql-test/r/create_or_replace.result              |    4 +-
 mysql-test/r/create_or_replace_permission.result   |    3 +
 mysql-test/r/ctype_big5.result                     |  302 +-
 mysql-test/r/ctype_binary.result                   |  373 +-
 mysql-test/r/ctype_collate.result                  |    2 +-
 mysql-test/r/ctype_cp1250_ch.result                |  124 +-
 mysql-test/r/ctype_cp1251.result                   |  305 +-
 mysql-test/r/ctype_cp932_binlog_stm.result         |  404 +-
 mysql-test/r/ctype_eucjpms.result                  |  472 +-
 mysql-test/r/ctype_euckr.result                    |  290 +-
 mysql-test/r/ctype_gb2312.result                   |  290 +-
 mysql-test/r/ctype_gbk.result                      |  302 +-
 mysql-test/r/ctype_latin1.result                   |  544 ++-
 mysql-test/r/ctype_latin1_de.result                |    8 +-
 mysql-test/r/ctype_latin2.result                   |   10 +-
 mysql-test/r/ctype_latin2_ch.result                |  125 +-
 mysql-test/r/ctype_many.result                     |   22 +
 mysql-test/r/ctype_mb.result                       |    8 +-
 mysql-test/r/ctype_sjis.result                     |  434 +-
 mysql-test/r/ctype_tis620.result                   |  248 +-
 mysql-test/r/ctype_uca.result                      |  189 +-
 mysql-test/r/ctype_uca_innodb.result               |   38 +-
 mysql-test/r/ctype_ucs.result                      |  373 +-
 mysql-test/r/ctype_ujis.result                     |  474 +-
 mysql-test/r/ctype_utf16.result                    |   85 +-
 mysql-test/r/ctype_utf16_uca.result                |   16 +-
 mysql-test/r/ctype_utf16le.result                  |   85 +-
 mysql-test/r/ctype_utf32.result                    |   42 +-
 mysql-test/r/ctype_utf32_uca.result                |   16 +-
 mysql-test/r/ctype_utf8.result                     |  487 +-
 mysql-test/r/ctype_utf8mb4.result                  |   20 +-
 mysql-test/r/ctype_utf8mb4_heap.result             |   73 +-
 mysql-test/r/ctype_utf8mb4_innodb.result           |   73 +-
 mysql-test/r/ctype_utf8mb4_myisam.result           |   73 +-
 mysql-test/r/ctype_utf8mb4_uca.result              |    2 +-
 mysql-test/r/ddl_i18n_koi8r.result                 |    1 +
 mysql-test/r/ddl_i18n_utf8.result                  |    1 +
 mysql-test/r/default.result                        |    2 +
 mysql-test/r/delete_returning_grant.result         |    3 +
 mysql-test/r/derived.result                        |   72 +-
 mysql-test/r/derived_view.result                   |   10 +-
 mysql-test/r/distinct.result                       |    2 +-
 mysql-test/r/empty_server_name-8224.result         |    1 +
 mysql-test/r/enforce_storage_engine.result         |   33 +
 mysql-test/r/enforce_storage_engine_opt.result     |    1 +
 mysql-test/r/events_1.result                       |    4 +-
 mysql-test/r/events_2.result                       |    1 +
 mysql-test/r/events_bugs.result                    |    1 +
 mysql-test/r/events_trans.result                   |    1 +
 mysql-test/r/events_trans_notembedded.result       |    1 +
 mysql-test/r/explain_json.result                   |  523 ++-
 mysql-test/r/explain_non_select.result             |   41 +
 mysql-test/r/features.result                       |    1 +
 mysql-test/r/fix_priv_tables.result                |    1 +
 mysql-test/r/flush-innodb-notembedded.result       |    1 +
 mysql-test/r/flush_read_lock.result                |    3 +
 mysql-test/r/func_compress.result                  |    5 +
 mysql-test/r/func_encrypt.result                   |   18 +
 mysql-test/r/func_gconcat.result                   |   16 +
 mysql-test/r/func_group.result                     |   65 +-
 mysql-test/r/func_hybrid_type.result               | 3400 ++++++++++++++
 mysql-test/r/func_if.result                        |   14 +
 mysql-test/r/func_in.result                        |   24 +
 mysql-test/r/func_like.result                      |   25 +
 mysql-test/r/func_math.result                      |   12 +-
 mysql-test/r/func_misc.result                      |  228 +-
 mysql-test/r/func_regexp_pcre.result               |   10 +-
 mysql-test/r/func_set.result                       |    8 +-
 mysql-test/r/func_str.result                       |  230 +-
 mysql-test/r/func_system.result                    |    6 +-
 mysql-test/r/func_test.result                      |   39 +
 mysql-test/r/func_time.result                      |   96 +-
 mysql-test/r/func_time_hires.result                |   16 +-
 mysql-test/r/func_weight_string.result             |   50 +
 mysql-test/r/gis-alter_table_online.result         |   51 +
 mysql-test/r/gis-debug.result                      |    2 +
 mysql-test/r/gis-precise.result                    |    2 +
 mysql-test/r/gis-rtree.result                      |   24 +
 mysql-test/r/gis.result                            |   17 +-
 mysql-test/r/grant.result                          |   26 +
 mysql-test/r/grant2.result                         |    3 +
 mysql-test/r/grant3.result                         |    3 +
 mysql-test/r/grant4.result                         |    3 +
 mysql-test/r/grant_4332.result                     |    3 +
 mysql-test/r/grant_cache_no_prot.result            |    8 +
 mysql-test/r/grant_cache_ps_prot.result            |    8 +
 mysql-test/r/grant_explain_non_select.result       |    4 +
 mysql-test/r/grant_lowercase.result                |    7 +-
 mysql-test/r/grant_lowercase_fs.result             |    2 +
 mysql-test/r/group_by.result                       |   92 +-
 mysql-test/r/group_min_max.result                  |   16 +
 mysql-test/r/help.result                           |    2 +
 mysql-test/r/host_cache_size_functionality.result  |    2 +-
 mysql-test/r/implicit_commit.result                |    1 +
 mysql-test/r/index_intersect.result                |    5 +-
 mysql-test/r/index_intersect_innodb.result         |    2 +-
 mysql-test/r/information_schema.result             |   13 +-
 mysql-test/r/information_schema2.result            |   24 +-
 mysql-test/r/information_schema_db.result          |    3 +
 mysql-test/r/information_schema_linux.result       |    7 +
 mysql-test/r/information_schema_routines.result    |    2 +
 mysql-test/r/innodb_icp.result                     |   14 +-
 mysql-test/r/innodb_load_xa.result                 |    2 +
 mysql-test/r/innodb_mrr_cpk.result                 |    2 +-
 mysql-test/r/insert.result                         |   34 +-
 mysql-test/r/insert_notembedded.result             |    4 +
 mysql-test/r/join_cache.result                     |   65 +-
 mysql-test/r/key.result                            |   12 +-
 mysql-test/r/kill.result                           |   15 +
 mysql-test/r/loaddata.result                       |   24 +
 mysql-test/r/loadxml.result                        |   27 +
 mysql-test/r/lock_multi.result                     |    2 +
 mysql-test/r/log_tables.result                     |    1 +
 mysql-test/r/lowercase_fs_off.result               |    3 +
 mysql-test/r/lowercase_fs_on.result                |    4 +
 mysql-test/r/lowercase_table3.result               |   11 -
 mysql-test/r/lowercase_table4.result               |    3 +
 mysql-test/r/lowercase_table_grant.result          |    1 +
 mysql-test/r/lowercase_table_qcache.result         |    5 +-
 mysql-test/r/max_statement_time.result             |    6 +-
 mysql-test/r/mdev-504.result                       |    2 +
 mysql-test/r/merge.result                          |   13 +-
 mysql-test/r/merge_recover.result                  |  103 -
 mysql-test/r/metadata.result                       |    4 +-
 mysql-test/r/mix2_myisam.result                    |   10 +-
 mysql-test/r/multi_update.result                   |    5 +-
 mysql-test/r/myisam-optimize.result                |   69 +
 mysql-test/r/myisam_explain_non_select_all.result  |    5 +-
 mysql-test/r/myisam_icp.result                     |   20 +-
 mysql-test/r/myisam_recover.result                 |  150 +
 mysql-test/r/mysql.result                          |    3 +
 mysql-test/r/mysql_comments.result                 |    2 +
 mysql-test/r/mysql_upgrade.result                  |   62 +
 mysql-test/r/mysqlbinlog-innodb.result             |    4 +-
 mysql-test/r/mysqlbinlog.result                    |   20 +-
 mysql-test/r/mysqlbinlog_row_big.result            |    2 +-
 mysql-test/r/mysqld--help.result                   |   71 +-
 mysql-test/r/mysqldump-max.result                  |   10 +-
 mysql-test/r/mysqldump.result                      |   70 +-
 mysql-test/r/null.result                           |   81 +-
 mysql-test/r/openssl_1.result                      |    3 +
 mysql-test/r/openssl_6975,tlsv10.result            |    2 +
 mysql-test/r/openssl_6975,tlsv12.result            |    2 +
 mysql-test/r/order_by.result                       |    2 +
 mysql-test/r/parser.result                         |  227 +
 mysql-test/r/partition_alter.result                |   53 +
 mysql-test/r/partition_cache.result                |    3 +
 mysql-test/r/partition_cache_innodb.result         |    3 +
 mysql-test/r/partition_cache_myisam.result         |    3 +
 mysql-test/r/partition_datatype.result             |    2 +-
 mysql-test/r/partition_error.result                |    2 +-
 mysql-test/r/partition_exchange.result             |   62 +-
 mysql-test/r/partition_grant.result                |    1 +
 mysql-test/r/partition_hash.result                 |    2 +
 mysql-test/r/partition_innodb.result               |    2 +
 mysql-test/r/partition_innodb_plugin.result        |    2 +-
 mysql-test/r/plugin.result                         |    7 +-
 mysql-test/r/plugin_auth.result                    |    5 +-
 mysql-test/r/plugin_auth_qa.result                 |    1 +
 mysql-test/r/plugin_not_embedded.result            |    1 +
 mysql-test/r/ps.result                             |   52 +-
 mysql-test/r/ps_1general.result                    |    5 +-
 mysql-test/r/ps_2myisam.result                     |   33 +-
 mysql-test/r/ps_3innodb.result                     |   33 +-
 mysql-test/r/ps_4heap.result                       |   33 +-
 mysql-test/r/ps_5merge.result                      |   70 +-
 mysql-test/r/query_cache.result                    |   15 +-
 mysql-test/r/query_cache_debug.result              |    1 +
 mysql-test/r/query_cache_merge.result              |    5 +-
 mysql-test/r/query_cache_notembedded.result        |   12 +-
 mysql-test/r/query_cache_ps_no_prot.result         |    3 +
 mysql-test/r/query_cache_ps_ps_prot.result         |    3 +
 mysql-test/r/query_cache_with_views.result         |    3 +
 mysql-test/r/range.result                          |   36 +
 mysql-test/r/range_mrr_icp.result                  |   36 +
 mysql-test/r/read_only.result                      |    2 +
 mysql-test/r/read_only_innodb.result               |    2 +
 mysql-test/r/repair_symlink-5543.result            |    7 +-
 mysql-test/r/row.result                            |   22 +
 mysql-test/r/select.result                         |   13 +-
 mysql-test/r/select_jcl6.result                    |   13 +-
 mysql-test/r/select_pkeycache.result               |   13 +-
 mysql-test/r/selectivity.result                    |   18 +-
 mysql-test/r/selectivity_innodb.result             |   12 +-
 mysql-test/r/selectivity_no_engine.result          |   17 +
 mysql-test/r/servers.result                        |    1 +
 mysql-test/r/set_statement.result                  |   13 +-
 mysql-test/r/show_check.result                     |   90 +-
 mysql-test/r/show_explain.result                   |    1 +
 mysql-test/r/single_delete_update.result           |   32 -
 mysql-test/r/single_delete_update_innodb.result    |   32 +
 mysql-test/r/skip_grants.result                    |    4 +-
 mysql-test/r/skip_name_resolve.result              |    1 +
 mysql-test/r/sp-error.result                       |   24 +-
 mysql-test/r/sp-group.result                       |  156 +
 mysql-test/r/sp-lock.result                        |    2 +-
 mysql-test/r/sp-security.result                    |   23 +-
 mysql-test/r/sp-ucs2.result                        |   12 +-
 mysql-test/r/sp.result                             |   68 +-
 mysql-test/r/sp_notembedded.result                 |    3 +
 mysql-test/r/sp_trans.result                       |    1 +
 mysql-test/r/sql_mode.result                       |    2 +-
 mysql-test/r/stack-crash.result                    |   10 +-
 mysql-test/r/stat_tables_rbr.result                |   25 +-
 mysql-test/r/status.result                         |    1 +
 mysql-test/r/strict.result                         |   24 +-
 mysql-test/r/subselect.result                      |  106 +-
 mysql-test/r/subselect_cache.result                |  225 +
 mysql-test/r/subselect_innodb.result               |    2 -
 mysql-test/r/subselect_mat.result                  |   40 +
 mysql-test/r/subselect_no_exists_to_in.result      |  106 +-
 mysql-test/r/subselect_no_mat.result               |  106 +-
 mysql-test/r/subselect_no_opts.result              |  106 +-
 mysql-test/r/subselect_no_scache.result            |  106 +-
 mysql-test/r/subselect_no_semijoin.result          |  106 +-
 mysql-test/r/subselect_sj.result                   |   14 +-
 mysql-test/r/subselect_sj2.result                  |   56 +-
 mysql-test/r/subselect_sj2_jcl6.result             |   56 +-
 mysql-test/r/subselect_sj2_mat.result              |   56 +-
 mysql-test/r/subselect_sj_jcl6.result              |   14 +-
 mysql-test/r/subselect_sj_mat.result               |   40 +
 mysql-test/r/system_mysql_db_fix40123.result       |  314 ++
 mysql-test/r/system_mysql_db_fix50030.result       |  314 ++
 mysql-test/r/table_elim.result                     |   10 +-
 mysql-test/r/temp_table.result                     |    2 +-
 mysql-test/r/temporal_literal.result               |   68 +-
 mysql-test/r/timezone_grant.result                 |    2 +
 mysql-test/r/trigger-compat.result                 |    4 +-
 mysql-test/r/trigger.result                        |    7 +
 mysql-test/r/trigger_notembedded.result            |   15 +-
 mysql-test/r/truncate.result                       |    2 +-
 mysql-test/r/type_binary.result                    |   34 +
 mysql-test/r/type_blob.result                      |    8 +-
 mysql-test/r/type_date.result                      |  307 ++
 mysql-test/r/type_datetime.result                  |  252 +-
 mysql-test/r/type_decimal.result                   |    9 +-
 mysql-test/r/type_enum.result                      |   52 +
 mysql-test/r/type_float.result                     |  116 +-
 mysql-test/r/type_int.result                       |   38 +
 mysql-test/r/type_newdecimal.result                |  163 +-
 mysql-test/r/type_num.result                       | 1222 +++++
 mysql-test/r/type_ranges.result                    |   21 +-
 mysql-test/r/type_set.result                       |   52 +
 mysql-test/r/type_time.result                      |  824 ++++
 mysql-test/r/type_timestamp.result                 |  186 +-
 mysql-test/r/type_timestamp_hires.result           |   12 +-
 mysql-test/r/type_varchar.result                   |    2 +
 mysql-test/r/type_year.result                      |   44 +
 mysql-test/r/union.result                          |   98 +-
 mysql-test/r/update.result                         |   15 +
 mysql-test/r/user_limits.result                    |    5 +
 mysql-test/r/user_var-binlog.result                |    2 +-
 mysql-test/r/varbinary.result                      |    2 +
 mysql-test/r/variables.result                      |   10 +-
 mysql-test/r/view.result                           |  170 +-
 mysql-test/r/view_debug.result                     |   21 +
 mysql-test/r/view_grant.result                     |   34 +-
 mysql-test/r/warnings_engine_disabled.result       |    2 +
 mysql-test/r/xml.result                            |    6 +
 mysql-test/std_data/bug16171518_1.dat              |   59 +
 mysql-test/std_data/bug16171518_2.dat              |   12 +
 mysql-test/std_data/galera-cert.pem                |   20 +
 mysql-test/std_data/galera-key.pem                 |   28 +
 mysql-test/std_data/logkey.txt                     |    2 +
 mysql-test/std_data/wsrep_notify.sh                |   99 +
 mysql-test/suite/archive/archive_plugin.result     |    7 +-
 mysql-test/suite/archive/archive_plugin.test       |    4 +-
 mysql-test/suite/archive/discover_5438.result      |    1 +
 mysql-test/suite/archive/discover_5438.test        |    1 +
 mysql-test/suite/binlog/r/binlog_database.result   |    2 -
 mysql-test/suite/binlog/r/binlog_grant.result      |    1 +
 mysql-test/suite/binlog/r/binlog_innodb_row.result |    3 -
 .../suite/binlog/r/binlog_mysqlbinlog2.result      |    1 +
 .../suite/binlog/r/binlog_mysqlbinlog_row.result   |   12 +-
 .../binlog/r/binlog_mysqlbinlog_row_innodb.result  |   86 +-
 .../binlog/r/binlog_mysqlbinlog_row_myisam.result  |   86 +-
 .../binlog/r/binlog_mysqlbinlog_row_trans.result   |    2 +-
 mysql-test/suite/binlog/r/binlog_row_binlog.result |    2 -
 .../suite/binlog/r/binlog_row_ctype_cp932.result   |   24 +
 .../suite/binlog/r/binlog_row_ctype_ucs.result     |    2 +-
 .../suite/binlog/r/binlog_row_drop_tmp_tbl.result  |    8 -
 .../binlog/r/binlog_row_mix_innodb_myisam.result   |    4 +-
 .../binlog/r/binlog_row_mysqlbinlog_options.result |    4 +-
 .../suite/binlog/r/binlog_stm_ctype_cp932.result   |   24 +
 .../suite/binlog/r/binlog_stm_ctype_ucs.result     |    2 +-
 .../binlog/r/binlog_stm_mix_innodb_myisam.result   |    4 +-
 mysql-test/suite/binlog/t/binlog_grant.test        |    1 +
 mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test |    1 +
 .../suite/binlog/t/binlog_mysqlbinlog_row.test     |    2 +-
 mysql-test/suite/binlog/t/binlog_row_annotate.test |    2 +
 mysql-test/suite/csv/csv.result                    |   54 +
 mysql-test/suite/csv/csv.test                      |   43 +
 mysql-test/suite/encryption/disabled.def           |    2 +
 .../suite/encryption/r/debug_key_management.result |    2 +
 .../suite/encryption/r/filekeys_nofile.result      |    4 +-
 mysql-test/suite/encryption/r/innochecksum.result  |   23 +
 .../encryption/r/innodb-bad-key-change.result      |  136 +
 .../encryption/r/innodb-bad-key-change2.result     |   26 +
 .../encryption/r/innodb-bad-key-change3.result     |   44 +
 .../encryption/r/innodb-bad-key-change4.result     |   20 +
 .../encryption/r/innodb-bad-key-change5.result     |   28 +
 .../encryption/r/innodb-bad-key-shutdown.result    |   20 +
 .../encryption/r/innodb-discard-import.result      |  144 +
 .../encryption/r/innodb-encryption-alter.result    |   53 +
 .../suite/encryption/r/innodb-log-encrypt.result   |   55 +
 .../encryption/r/innodb-page_encryption.result     |   15 +
 .../r/innodb-page_encryption_compression.result    |    4 +
 .../r/innodb-page_encryption_log_encryption.result |   10 +
 .../r/innodb_encryption_discard_import.result      |  136 +
 .../encryption/r/innodb_encryption_filekeys.result |   67 +
 .../r/innodb_onlinealter_encryption.result         |  176 +
 .../r/innodb_page_encryption_key_change.result     |   10 +
 .../suite/encryption/t/create_or_replace.test      |    2 +
 .../suite/encryption/t/debug_key_management.opt    |    1 -
 .../suite/encryption/t/debug_key_management.test   |    3 +
 .../suite/encryption/t/encrypt_and_grep.test       |    8 +-
 mysql-test/suite/encryption/t/filekeys_nofile.test |    2 +-
 .../suite/encryption/t/filekeys_plugin_exists.inc  |    4 +
 mysql-test/suite/encryption/t/innochecksum.test    |  101 +
 .../suite/encryption/t/innodb-bad-key-change.test  |  122 +
 .../suite/encryption/t/innodb-bad-key-change2.test |   59 +
 .../suite/encryption/t/innodb-bad-key-change3.test |  114 +
 .../suite/encryption/t/innodb-bad-key-change4.test |   89 +
 .../suite/encryption/t/innodb-bad-key-change5.opt  |    4 +
 .../suite/encryption/t/innodb-bad-key-change5.test |   88 +
 .../encryption/t/innodb-bad-key-shutdown.test      |   68 +
 .../suite/encryption/t/innodb-discard-import.test  |  167 +
 .../encryption/t/innodb-encryption-alter.test      |   98 +
 .../suite/encryption/t/innodb-log-encrypt.opt      |    6 +
 .../suite/encryption/t/innodb-log-encrypt.test     |  112 +
 .../suite/encryption/t/innodb-page_encryption.test |    6 +
 .../t/innodb-page_encryption_compression.test      |    2 +
 .../t/innodb-page_encryption_log_encryption.test   |    5 +
 .../suite/encryption/t/innodb_encryption.opt       |    8 +-
 .../t/innodb_encryption_discard_import.opt         |    8 +
 .../t/innodb_encryption_discard_import.test        |  226 +
 .../encryption/t/innodb_encryption_filekeys.opt    |    1 +
 .../encryption/t/innodb_encryption_filekeys.test   |  145 +
 .../suite/encryption/t/innodb_first_page.test      |    2 +
 .../encryption/t/innodb_onlinealter_encryption.opt |    8 +
 .../t/innodb_onlinealter_encryption.test           |  191 +
 .../t/innodb_page_encryption_key_change.test       |    5 +
 mysql-test/suite/federated/federatedx.result       |    7 +
 mysql-test/suite/federated/federatedx.test         |    2 +
 .../suite/funcs_1/datadict/datadict_priv.inc       |    4 +-
 mysql-test/suite/funcs_1/datadict/is_routines.inc  |    1 +
 mysql-test/suite/funcs_1/datadict/is_triggers.inc  |    2 +
 .../suite/funcs_1/datadict/processlist_priv.inc    |   31 +-
 .../suite/funcs_1/datadict/processlist_val.inc     |   14 +-
 mysql-test/suite/funcs_1/include/innodb_tb4.inc    |    2 +-
 mysql-test/suite/funcs_1/include/memory_tb4.inc    |    2 +-
 mysql-test/suite/funcs_1/include/myisam_tb4.inc    |    2 +-
 mysql-test/suite/funcs_1/r/innodb_func_view.result |   88 +-
 .../suite/funcs_1/r/innodb_storedproc_06.result    |    3 +
 .../suite/funcs_1/r/innodb_storedproc_08.result    |    1 +
 mysql-test/suite/funcs_1/r/innodb_trig_03.result   |    1 +
 mysql-test/suite/funcs_1/r/innodb_trig_03e.result  |    4 +-
 mysql-test/suite/funcs_1/r/innodb_trig_0407.result |    3 +
 mysql-test/suite/funcs_1/r/innodb_trig_08.result   |    3 +
 mysql-test/suite/funcs_1/r/innodb_views.result     |    2 +-
 mysql-test/suite/funcs_1/r/is_columns.result       |   12 +-
 .../suite/funcs_1/r/is_columns_innodb.result       |    2 +-
 mysql-test/suite/funcs_1/r/is_columns_is.result    |   30 +-
 .../suite/funcs_1/r/is_columns_is_embedded.result  |   30 +-
 .../suite/funcs_1/r/is_columns_memory.result       |    2 +-
 .../suite/funcs_1/r/is_columns_myisam.result       |    2 +-
 .../funcs_1/r/is_columns_myisam_embedded.result    |    2 +-
 mysql-test/suite/funcs_1/r/is_routines.result      |    1 +
 mysql-test/suite/funcs_1/r/is_triggers.result      |    2 +
 mysql-test/suite/funcs_1/r/memory_func_view.result |   88 +-
 .../suite/funcs_1/r/memory_storedproc_06.result    |    2 +
 mysql-test/suite/funcs_1/r/memory_trig_03e.result  |    4 +-
 mysql-test/suite/funcs_1/r/memory_trig_0407.result |    2 +
 mysql-test/suite/funcs_1/r/memory_trig_08.result   |    2 +
 mysql-test/suite/funcs_1/r/memory_views.result     |    2 +-
 mysql-test/suite/funcs_1/r/myisam_func_view.result |   88 +-
 .../suite/funcs_1/r/myisam_storedproc_06.result    |    2 +
 mysql-test/suite/funcs_1/r/myisam_trig_03e.result  |    4 +-
 mysql-test/suite/funcs_1/r/myisam_trig_0407.result |    2 +
 mysql-test/suite/funcs_1/r/myisam_trig_08.result   |    2 +
 mysql-test/suite/funcs_1/r/myisam_views-big.result |    2 +-
 .../funcs_1/r/processlist_priv_no_prot.result      |  151 +-
 .../suite/funcs_1/r/processlist_priv_ps.result     |  151 +-
 .../suite/funcs_1/r/processlist_val_no_prot.result |   47 +-
 .../suite/funcs_1/r/processlist_val_ps.result      |   47 +-
 mysql-test/suite/funcs_1/r/storedproc.result       |    3 +-
 .../suite/funcs_1/storedproc/storedproc_06.inc     |    3 +
 .../suite/funcs_1/t/innodb_storedproc_06.test      |    1 +
 .../suite/funcs_1/t/innodb_storedproc_08.test      |    1 +
 mysql-test/suite/funcs_1/t/innodb_trig_03.test     |    1 +
 mysql-test/suite/funcs_1/t/innodb_trig_0407.test   |    1 +
 mysql-test/suite/funcs_1/t/innodb_trig_08.test     |    1 +
 mysql-test/suite/funcs_1/t/storedproc.test         |    1 +
 .../suite/funcs_1/triggers/triggers_0407.inc       |    4 +
 mysql-test/suite/funcs_1/triggers/triggers_08.inc  |    2 +
 mysql-test/suite/funcs_1/views/func_view.inc       |    2 +-
 mysql-test/suite/funcs_1/views/views_master.inc    |    2 +-
 mysql-test/suite/galera/disabled.def               |   21 +
 mysql-test/suite/galera/galera_2nodes.cnf          |   12 +-
 .../suite/galera/galera_2nodes_as_master.cnf       |   70 +
 mysql-test/suite/galera/galera_2nodes_as_slave.cnf |   69 +
 mysql-test/suite/galera/galera_4nodes.cnf          |   74 +
 .../galera/include/galera_have_debug_sync.inc      |    9 +
 .../suite/galera/include/galera_load_provider.inc  |   10 +
 .../include/galera_reset_cluster_address.inc       |   12 +
 mysql-test/suite/galera/include/galera_resume.inc  |    9 +
 .../suite/galera/include/galera_sst_restore.inc    |   29 +
 .../galera/include/galera_sst_set_mysqldump.inc    |   22 +
 .../suite/galera/include/galera_st_clean_slave.inc |  113 +
 .../galera/include/galera_st_disconnect_slave.inc  |  105 +
 .../suite/galera/include/galera_st_kill_slave.inc  |  108 +
 .../galera/include/galera_st_kill_slave_ddl.inc    |  123 +
 .../galera/include/galera_st_shutdown_slave.inc    |  105 +
 .../galera/include/galera_unload_provider.inc      |    7 +
 .../suite/galera/include/galera_wsrep_recover.inc  |   23 +
 mysql-test/suite/galera/include/kill_galera.inc    |   20 +
 .../suite/galera/include/shutdown_mysqld.inc       |   18 +
 mysql-test/suite/galera/include/start_mysqld.inc   |   22 +
 mysql-test/suite/galera/r/binlog_checksum.result   |   36 +
 mysql-test/suite/galera/r/create.result            |   38 +
 .../suite/galera/r/enforce_storage_engine.result   |   22 +
 .../galera/r/galera_account_management.result      |   40 +
 .../galera/r/galera_alter_engine_innodb.result     |   10 +
 .../galera/r/galera_alter_engine_myisam.result     |   11 +
 .../suite/galera/r/galera_alter_table_force.result |   10 +
 mysql-test/suite/galera/r/galera_as_master.result  |   48 +
 .../suite/galera/r/galera_as_master_gtid.result    |   59 +
 .../r/galera_as_master_gtid_change_master.result   |   15 +
 mysql-test/suite/galera/r/galera_as_slave.result   |   14 +
 .../suite/galera/r/galera_as_slave_gtid.result     |   16 +
 mysql-test/suite/galera/r/galera_bf_abort.result   |   10 +
 .../galera/r/galera_bf_abort_for_update.result     |   10 +
 .../suite/galera/r/galera_bf_abort_ftwrl.result    |    8 +
 .../suite/galera/r/galera_bf_abort_get_lock.result |   12 +
 .../galera/r/galera_bf_abort_lock_table.result     |    8 +
 .../suite/galera/r/galera_bf_abort_sleep.result    |    9 +
 .../suite/galera/r/galera_binlog_cache_size.result |   12 +
 .../suite/galera/r/galera_binlog_checksum.result   |   10 +
 .../r/galera_binlog_event_max_size_max.result      |    9 +
 .../r/galera_binlog_event_max_size_min.result      |    6 +
 .../suite/galera/r/galera_binlog_row_image.result  |   79 +
 .../r/galera_binlog_rows_query_log_events.result   |   12 +
 .../suite/galera/r/galera_concurrent_ctas.result   |    1 +
 .../suite/galera/r/galera_create_function.result   |   55 +
 .../suite/galera/r/galera_create_procedure.result  |   53 +
 .../suite/galera/r/galera_create_table_like.result |   47 +
 .../suite/galera/r/galera_create_trigger.result    |   42 +
 mysql-test/suite/galera/r/galera_defaults.result   |  120 +
 .../suite/galera/r/galera_delete_limit.result      |   19 +
 mysql-test/suite/galera/r/galera_enum.result       |   37 +
 mysql-test/suite/galera/r/galera_events.result     |   18 +
 .../suite/galera/r/galera_fk_multicolumn.result    |    6 +-
 .../suite/galera/r/galera_fk_multitable.result     |    4 +-
 mysql-test/suite/galera/r/galera_flush.result      |   32 +
 mysql-test/suite/galera/r/galera_ftwrl.result      |   16 +
 mysql-test/suite/galera/r/galera_fulltext.result   |   26 +
 .../suite/galera/r/galera_gcs_fc_limit.result      |   17 +
 .../galera/r/galera_gcs_max_packet_size.result     |   15 +
 mysql-test/suite/galera/r/galera_gtid.result       |   12 +
 .../suite/galera/r/galera_insert_ignore.result     |   52 +
 .../suite/galera/r/galera_insert_multi.result      |   58 +
 .../galera/r/galera_ist_innodb_flush_logs.result   |  184 +
 .../suite/galera/r/galera_ist_mysqldump.result     |  284 ++
 .../galera/r/galera_ist_restart_joiner.result      |   43 +
 mysql-test/suite/galera/r/galera_ist_rsync.result  |  358 ++
 .../suite/galera/r/galera_ist_xtrabackup-v2.result |  357 ++
 mysql-test/suite/galera/r/galera_kill_ddl.result   |   11 +
 .../suite/galera/r/galera_kill_largechanges.result |   14 +
 .../suite/galera/r/galera_kill_nochanges.result    |   10 +
 .../suite/galera/r/galera_kill_smallchanges.result |   11 +
 mysql-test/suite/galera/r/galera_lock_table.result |   21 +
 mysql-test/suite/galera/r/galera_log_bin.result    |   58 +
 .../suite/galera/r/galera_log_output_csv.result    |   21 +
 .../suite/galera/r/galera_many_columns.result      | 1018 -----
 mysql-test/suite/galera/r/galera_many_rows.result  |    2 +-
 .../suite/galera/r/galera_many_tables_nopk.result  |   17 +
 .../suite/galera/r/galera_many_tables_pk.result    |   20 +
 mysql-test/suite/galera/r/galera_migrate.result    |   79 +
 .../suite/galera/r/galera_multi_database.result    |   28 +
 .../suite/galera/r/galera_myisam_autocommit.result |   24 +
 .../galera/r/galera_myisam_transactions.result     |   34 +
 .../suite/galera/r/galera_nopk_unicode.result      |   24 +
 .../r/galera_parallel_apply_lock_table.result      |   33 +
 .../r/galera_parallel_autoinc_largetrx.result      |   18 +
 .../r/galera_parallel_autoinc_manytrx.result       |   15 +
 .../suite/galera/r/galera_parallel_simple.result   |   27 +
 .../suite/galera/r/galera_pc_ignore_sb.result      |   12 +
 .../suite/galera/r/galera_pk_bigint_signed.result  |   26 +
 .../galera/r/galera_pk_bigint_unsigned.result      |   23 +
 .../suite/galera/r/galera_query_cache.result       |   57 +
 mysql-test/suite/galera/r/galera_read_only.result  |    8 +
 .../galera/r/galera_repl_key_format_flat16.result  |   18 +
 .../suite/galera/r/galera_repl_max_ws_size.result  |    8 +
 .../suite/galera/r/galera_restart_nochanges.result |    9 +
 mysql-test/suite/galera/r/galera_roles.result      |  156 +
 mysql-test/suite/galera/r/galera_rsu_add_pk.result |   26 +
 .../suite/galera/r/galera_rsu_drop_pk.result       |   42 +
 mysql-test/suite/galera/r/galera_rsu_error.result  |   21 +
 mysql-test/suite/galera/r/galera_rsu_simple.result |   21 +
 mysql-test/suite/galera/r/galera_sbr.result        |   14 +
 mysql-test/suite/galera/r/galera_sbr_binlog.result |   14 +
 .../suite/galera/r/galera_split_brain.result       |    5 +
 .../suite/galera/r/galera_sql_log_bin_zero.result  |   12 +
 mysql-test/suite/galera/r/galera_ssl.result        |   18 +
 .../suite/galera/r/galera_sst_mysqldump.result     |  459 ++
 mysql-test/suite/galera/r/galera_sst_rsync.result  |  359 ++
 .../suite/galera/r/galera_sst_xtrabackup-v2.result |  358 ++
 .../suite/galera/r/galera_status_cluster.result    |   12 +
 .../galera/r/galera_status_local_state.result      |   14 +
 .../suite/galera/r/galera_suspend_slave.result     |   10 +
 .../r/galera_toi_alter_auto_increment.result       |   42 +
 .../suite/galera/r/galera_toi_ddl_error.result     |   19 +
 .../suite/galera/r/galera_toi_ddl_fk_insert.result |   31 +
 .../suite/galera/r/galera_toi_ddl_locking.result   |   41 +
 .../galera/r/galera_toi_ddl_nonconflicting.result  |   23 +
 .../galera/r/galera_toi_ddl_sequential.result      |   35 +
 mysql-test/suite/galera/r/galera_toi_ftwrl.result  |   12 +
 .../galera/r/galera_toi_lock_exclusive.result      |   17 +
 .../suite/galera/r/galera_toi_lock_shared.result   |   12 +
 .../galera/r/galera_transaction_read_only.result   |   21 +
 .../galera/r/galera_transaction_replay.result      |   30 +
 mysql-test/suite/galera/r/galera_truncate.result   |   29 +
 .../galera/r/galera_truncate_temporary.result      |   63 +
 .../galera/r/galera_unicode_identifiers.result     |   20 +-
 mysql-test/suite/galera/r/galera_unicode_pk.result |   31 +
 .../suite/galera/r/galera_update_limit.result      |   17 +
 .../suite/galera/r/galera_v1_row_events.result     |   10 +
 .../suite/galera/r/galera_var_OSU_method.result    |   16 +
 .../suite/galera/r/galera_var_OSU_method2.result   |   19 +
 .../r/galera_var_auto_inc_control_off.result       |    6 -
 .../galera/r/galera_var_auto_inc_control_on.result |   22 +-
 .../galera/r/galera_var_certify_nonPK_off.result   |    2 +-
 .../galera/r/galera_var_cluster_address.result     |   51 +
 .../suite/galera/r/galera_var_desync_on.result     |   29 +
 .../r/galera_var_innodb_disallow_writes.result     |   12 +
 .../galera/r/galera_var_load_data_splitting.result |    9 +
 .../suite/galera/r/galera_var_max_ws_size.result   |    8 +
 .../suite/galera/r/galera_var_notify_cmd.result    |   10 +
 .../galera/r/galera_var_replicate_myisam_on.result |   72 +-
 .../suite/galera/r/galera_var_slave_threads.result |  106 +
 .../suite/galera/r/galera_var_wsrep_on_off.result  |   19 +
 mysql-test/suite/galera/r/galera_wan.result        |   14 +
 .../galera/r/galera_wsrep_desync_wsrep_on.result   |   33 +
 .../suite/galera/r/galera_wsrep_new_cluster.result |   36 +
 .../r/galera_wsrep_provider_unset_set.result       |   13 +
 .../galera/r/galera_zero_length_column.result      |   38 +
 mysql-test/suite/galera/r/lp1276424.result         |   11 +
 mysql-test/suite/galera/r/lp1347768.result         |   17 +
 mysql-test/suite/galera/r/lp959512.result          |   24 +
 mysql-test/suite/galera/r/mysql-wsrep#33.result    |  103 +
 mysql-test/suite/galera/r/partition.result         |  117 +
 mysql-test/suite/galera/r/rename.result            |   39 +
 mysql-test/suite/galera/r/rpl_row_annotate.result  |   66 +
 mysql-test/suite/galera/r/sql_log_bin.result       |   52 +
 mysql-test/suite/galera/r/view.result              |   45 +
 mysql-test/suite/galera/suite.pm                   |   36 +-
 mysql-test/suite/galera/t/binlog_checksum.test     |   36 +
 mysql-test/suite/galera/t/create.test              |   32 +
 .../suite/galera/t/enforce_storage_engine.test     |   33 +
 .../suite/galera/t/galera_account_management.test  |  101 +
 .../suite/galera/t/galera_alter_engine_innodb.test |   17 +
 .../suite/galera/t/galera_alter_engine_myisam.test |   25 +
 .../suite/galera/t/galera_alter_table_force.test   |   17 +
 mysql-test/suite/galera/t/galera_as_master.cnf     |    1 +
 mysql-test/suite/galera/t/galera_as_master.test    |   62 +
 .../suite/galera/t/galera_as_master_gtid.cnf       |    8 +
 .../suite/galera/t/galera_as_master_gtid.test      |   70 +
 .../t/galera_as_master_gtid_change_master.cnf      |    8 +
 .../t/galera_as_master_gtid_change_master.test     |   54 +
 mysql-test/suite/galera/t/galera_as_slave.cnf      |    1 +
 mysql-test/suite/galera/t/galera_as_slave.test     |   47 +
 mysql-test/suite/galera/t/galera_as_slave_gtid.cnf |    6 +
 .../suite/galera/t/galera_as_slave_gtid.test       |   67 +
 mysql-test/suite/galera/t/galera_bf_abort.test     |   29 +
 .../suite/galera/t/galera_bf_abort_for_update.test |   29 +
 .../suite/galera/t/galera_bf_abort_ftwrl.test      |   30 +
 .../suite/galera/t/galera_bf_abort_get_lock.test   |   36 +
 .../suite/galera/t/galera_bf_abort_lock_table.test |   33 +
 .../suite/galera/t/galera_bf_abort_sleep.test      |   30 +
 .../suite/galera/t/galera_binlog_cache_size.test   |   35 +
 .../galera/t/galera_binlog_checksum-master.opt     |    1 +
 .../suite/galera/t/galera_binlog_checksum.test     |   22 +
 .../t/galera_binlog_event_max_size_max-master.opt  |    1 +
 .../galera/t/galera_binlog_event_max_size_max.test |   20 +
 .../t/galera_binlog_event_max_size_min-master.opt  |    1 +
 .../galera/t/galera_binlog_event_max_size_min.test |   15 +
 .../suite/galera/t/galera_binlog_row_image.test    |  100 +
 .../t/galera_binlog_rows_query_log_events.test     |   28 +
 .../suite/galera/t/galera_concurrent_ctas.test     |   57 +
 .../suite/galera/t/galera_create_function.test     |   57 +
 .../suite/galera/t/galera_create_procedure.test    |   52 +
 .../suite/galera/t/galera_create_table_like.test   |   50 +
 .../suite/galera/t/galera_create_trigger.test      |   43 +
 mysql-test/suite/galera/t/galera_defaults.test     |   70 +
 mysql-test/suite/galera/t/galera_delete_limit.test |   52 +
 mysql-test/suite/galera/t/galera_enum.test         |   62 +
 mysql-test/suite/galera/t/galera_events.test       |   53 +
 .../suite/galera/t/galera_fk_multicolumn.test      |    6 +-
 .../suite/galera/t/galera_fk_multitable.test       |    4 +-
 mysql-test/suite/galera/t/galera_flush-master.opt  |    1 +
 mysql-test/suite/galera/t/galera_flush.test        |  107 +
 mysql-test/suite/galera/t/galera_ftwrl.test        |   39 +
 mysql-test/suite/galera/t/galera_fulltext.test     |   62 +
 mysql-test/suite/galera/t/galera_gcs_fc_limit.test |   52 +
 .../suite/galera/t/galera_gcs_max_packet_size.cnf  |    5 +
 .../suite/galera/t/galera_gcs_max_packet_size.test |   25 +
 mysql-test/suite/galera/t/galera_gtid-master.opt   |    1 +
 mysql-test/suite/galera/t/galera_gtid.test         |   27 +
 .../suite/galera/t/galera_insert_ignore.test       |   60 +
 mysql-test/suite/galera/t/galera_insert_multi.test |  122 +
 .../galera/t/galera_ist_innodb_flush_logs.cnf      |   12 +
 .../galera/t/galera_ist_innodb_flush_logs.test     |   12 +
 mysql-test/suite/galera/t/galera_ist_mysqldump.cnf |   11 +
 .../suite/galera/t/galera_ist_mysqldump.test       |   17 +
 .../suite/galera/t/galera_ist_restart_joiner.cnf   |    4 +
 .../suite/galera/t/galera_ist_restart_joiner.test  |  106 +
 mysql-test/suite/galera/t/galera_ist_rsync.cnf     |   11 +
 mysql-test/suite/galera/t/galera_ist_rsync.test    |    8 +
 .../suite/galera/t/galera_ist_xtrabackup-v2.cnf    |   11 +
 .../suite/galera/t/galera_ist_xtrabackup-v2.test   |    9 +
 mysql-test/suite/galera/t/galera_kill_ddl.test     |   39 +
 .../suite/galera/t/galera_kill_largechanges.test   |   43 +
 .../suite/galera/t/galera_kill_nochanges.test      |   24 +
 .../suite/galera/t/galera_kill_smallchanges.test   |   39 +
 mysql-test/suite/galera/t/galera_lock_table.test   |   43 +
 .../suite/galera/t/galera_log_bin-master.opt       |    1 +
 mysql-test/suite/galera/t/galera_log_bin.test      |   35 +
 .../galera/t/galera_log_output_csv-master.opt      |    1 +
 .../suite/galera/t/galera_log_output_csv.test      |   27 +
 mysql-test/suite/galera/t/galera_many_columns.test |   16 +-
 mysql-test/suite/galera/t/galera_many_rows.test    |    2 +-
 .../suite/galera/t/galera_many_tables_nopk.test    |  103 +
 .../suite/galera/t/galera_many_tables_pk.test      |   98 +
 mysql-test/suite/galera/t/galera_migrate.cnf       |   59 +
 mysql-test/suite/galera/t/galera_migrate.test      |  204 +
 .../suite/galera/t/galera_multi_database.test      |   43 +
 .../suite/galera/t/galera_myisam_autocommit.test   |   45 +
 .../suite/galera/t/galera_myisam_transactions.test |   36 +
 mysql-test/suite/galera/t/galera_nopk_unicode.test |   43 +
 .../galera/t/galera_parallel_apply_lock_table.test |   51 +
 .../galera/t/galera_parallel_autoinc_largetrx.test |   50 +
 .../galera/t/galera_parallel_autoinc_manytrx.test  |   53 +
 .../suite/galera/t/galera_parallel_simple.test     |   45 +
 mysql-test/suite/galera/t/galera_pc_ignore_sb.test |   49 +
 .../suite/galera/t/galera_pk_bigint_signed.test    |   46 +
 .../suite/galera/t/galera_pk_bigint_unsigned.test  |   45 +
 .../suite/galera/t/galera_query_cache-master.opt   |    3 +
 mysql-test/suite/galera/t/galera_query_cache.test  |   67 +
 mysql-test/suite/galera/t/galera_read_only.test    |   23 +
 .../galera/t/galera_repl_key_format_flat16.test    |   34 +
 .../suite/galera/t/galera_repl_max_ws_size.test    |   25 +
 .../suite/galera/t/galera_restart_nochanges.test   |   38 +
 mysql-test/suite/galera/t/galera_roles.test        |  167 +
 mysql-test/suite/galera/t/galera_rsu_add_pk.test   |   43 +
 mysql-test/suite/galera/t/galera_rsu_drop_pk.test  |   58 +
 mysql-test/suite/galera/t/galera_rsu_error.test    |   31 +
 mysql-test/suite/galera/t/galera_rsu_simple.test   |   34 +
 mysql-test/suite/galera/t/galera_sbr.test          |   27 +
 .../suite/galera/t/galera_sbr_binlog-master.opt    |    1 +
 mysql-test/suite/galera/t/galera_sbr_binlog.test   |   28 +
 mysql-test/suite/galera/t/galera_split_brain.test  |   53 +
 .../suite/galera/t/galera_sql_log_bin_zero.test    |   26 +
 mysql-test/suite/galera/t/galera_ssl.cnf           |    7 +
 mysql-test/suite/galera/t/galera_ssl.test          |   24 +
 mysql-test/suite/galera/t/galera_sst_mysqldump.cnf |   11 +
 .../suite/galera/t/galera_sst_mysqldump.test       |   18 +
 mysql-test/suite/galera/t/galera_sst_rsync.cnf     |   11 +
 mysql-test/suite/galera/t/galera_sst_rsync.test    |    9 +
 .../suite/galera/t/galera_sst_xtrabackup-v2.cnf    |   13 +
 .../suite/galera/t/galera_sst_xtrabackup-v2.test   |    9 +
 .../suite/galera/t/galera_status_cluster.test      |   18 +
 .../suite/galera/t/galera_status_local_state.test  |   28 +
 .../suite/galera/t/galera_suspend_slave.test       |   66 +
 .../galera/t/galera_toi_alter_auto_increment.test  |  120 +
 .../suite/galera/t/galera_toi_ddl_error.test       |   29 +
 .../suite/galera/t/galera_toi_ddl_fk_insert.test   |   70 +
 .../suite/galera/t/galera_toi_ddl_locking.test     |   76 +
 .../galera/t/galera_toi_ddl_nonconflicting.test    |   30 +
 .../suite/galera/t/galera_toi_ddl_sequential.test  |   29 +
 mysql-test/suite/galera/t/galera_toi_ftwrl.test    |   22 +
 .../suite/galera/t/galera_toi_lock_exclusive.test  |   38 +
 .../suite/galera/t/galera_toi_lock_shared.test     |   23 +
 .../galera/t/galera_transaction_read_only.test     |   58 +
 .../suite/galera/t/galera_transaction_replay.test  |   63 +
 mysql-test/suite/galera/t/galera_truncate.test     |   57 +
 .../suite/galera/t/galera_truncate_temporary.test  |   82 +
 mysql-test/suite/galera/t/galera_udf-master.opt    |    2 +
 .../suite/galera/t/galera_unicode_identifiers.test |   12 +-
 mysql-test/suite/galera/t/galera_unicode_pk.test   |   64 +
 mysql-test/suite/galera/t/galera_update_limit.test |   55 +
 .../suite/galera/t/galera_v1_row_events-master.opt |    1 +
 .../suite/galera/t/galera_v1_row_events.test       |   21 +
 .../suite/galera/t/galera_var_OSU_method.test      |   45 +
 .../suite/galera/t/galera_var_OSU_method2.test     |   47 +
 .../galera/t/galera_var_auto_inc_control_off.test  |    4 +
 .../galera/t/galera_var_auto_inc_control_on.test   |    7 +-
 .../galera/t/galera_var_certify_nonPK_off.test     |    2 +-
 .../suite/galera/t/galera_var_cluster_address.test |  110 +
 .../suite/galera/t/galera_var_desync_on.test       |   58 +
 .../t/galera_var_innodb_disallow_writes.test       |   33 +
 .../galera/t/galera_var_load_data_splitting.test   |   38 +
 .../suite/galera/t/galera_var_max_ws_size.test     |   23 +
 .../galera/t/galera_var_notify_cmd-master.opt      |    1 +
 .../suite/galera/t/galera_var_notify_cmd.test      |   14 +
 .../galera/t/galera_var_replicate_myisam_on.test   |  120 +-
 .../suite/galera/t/galera_var_slave_threads.test   |   70 +
 .../suite/galera/t/galera_var_wsrep_on_off.test    |   32 +
 mysql-test/suite/galera/t/galera_wan.cnf           |   14 +
 mysql-test/suite/galera/t/galera_wan.test          |   30 +
 .../galera/t/galera_wsrep_desync_wsrep_on.test     |   57 +
 .../galera/t/galera_wsrep_new_cluster-master.opt   |    1 +
 .../suite/galera/t/galera_wsrep_new_cluster.test   |   24 +
 .../galera/t/galera_wsrep_provider_unset_set.test  |   41 +
 .../suite/galera/t/galera_zero_length_column.test  |   41 +
 mysql-test/suite/galera/t/lp1276424.test           |   17 +
 mysql-test/suite/galera/t/lp1347768.test           |   24 +
 mysql-test/suite/galera/t/lp959512.test            |   26 +
 mysql-test/suite/galera/t/mysql-wsrep#33.cnf       |    8 +
 mysql-test/suite/galera/t/mysql-wsrep#33.test      |   18 +
 mysql-test/suite/galera/t/partition.test           |  176 +
 mysql-test/suite/galera/t/rename.test              |   53 +
 mysql-test/suite/galera/t/rpl_row_annotate.cnf     |    6 +
 mysql-test/suite/galera/t/rpl_row_annotate.test    |   42 +
 mysql-test/suite/galera/t/sql_log_bin.test         |   44 +
 mysql-test/suite/galera/t/view.test                |   39 +
 mysql-test/suite/galera_3nodes/disabled.def        |    2 +
 mysql-test/suite/galera_3nodes/galera_3nodes.cnf   |   60 +
 .../suite/galera_3nodes/include/galera_suspend.inc |   14 +
 mysql-test/suite/galera_3nodes/my.cnf              |    1 +
 .../r/galera_certification_ccc.result              |   17 +
 .../r/galera_certification_double_failure.result   |   12 +
 .../r/galera_evs_suspect_timeout.result            |   19 +
 .../suite/galera_3nodes/r/galera_garbd.result      |   14 +
 .../r/galera_ist_gcache_rollover.result            |   46 +
 .../r/galera_parallel_apply_3nodes.result          |   13 +
 .../suite/galera_3nodes/r/galera_pc_weight.result  |  118 +
 mysql-test/suite/galera_3nodes/suite.pm            |   52 +
 .../galera_3nodes/t/galera_certification_ccc.test  |   60 +
 .../t/galera_certification_double_failure.test     |   33 +
 .../t/galera_evs_suspect_timeout.test              |   67 +
 mysql-test/suite/galera_3nodes/t/galera_garbd.test |   50 +
 .../galera_3nodes/t/galera_ist_gcache_rollover.cnf |   11 +
 .../t/galera_ist_gcache_rollover.test              |   98 +
 .../t/galera_parallel_apply_3nodes.test            |   38 +
 .../suite/galera_3nodes/t/galera_pc_weight.test    |  110 +
 .../include/innodb_simulate_comp_failures.inc      |   15 +
 mysql-test/suite/innodb/r/add_constraint.result    |   13 +
 mysql-test/suite/innodb/r/binlog_consistent.result |   75 +-
 .../suite/innodb/r/group_commit_binlog_pos.result  |    2 +-
 ...oup_commit_binlog_pos_no_optimize_thread.result |    2 +-
 mysql-test/suite/innodb/r/innodb-16k.result        |    2 +-
 mysql-test/suite/innodb/r/innodb-32k.result        |   66 +-
 mysql-test/suite/innodb/r/innodb-64k.result        |   23 +-
 .../suite/innodb/r/innodb-alter-table.result       |   45 +
 .../suite/innodb/r/innodb-alter-timestamp.result   |   29 +
 mysql-test/suite/innodb/r/innodb-autoinc.result    |    2 +-
 mysql-test/suite/innodb/r/innodb-bigblob.result    |    1 +
 .../innodb/r/innodb-change-buffer-recovery.result  |    3 +
 .../suite/innodb/r/innodb-fk-warnings.result       |  112 +
 mysql-test/suite/innodb/r/innodb-fk.result         |    3 +
 mysql-test/suite/innodb/r/innodb-index.result      |    6 +-
 mysql-test/suite/innodb/r/innodb.result            |    3 +-
 .../suite/innodb/r/innodb_bug14147491.result       |   11 +
 mysql-test/suite/innodb/r/innodb_bug21704.result   |    6 +-
 mysql-test/suite/innodb/r/innodb_bug68148.result   |   36 +
 .../suite/innodb/r/innodb_defrag_binlog.result     |   34 +-
 mysql-test/suite/innodb/r/innodb_force_pk.result   |   12 +
 mysql-test/suite/innodb/r/innodb_monitor.result    |    2 +
 .../innodb/r/innodb_simulate_comp_failures.result  |    2 +-
 .../innodb/r/innodb_skip_innodb_is_tables.result   |    2 +
 mysql-test/suite/innodb/r/innodb_uninstall.result  |   26 +
 mysql-test/suite/innodb/t/add_constraint.test      |   21 +
 mysql-test/suite/innodb/t/binlog_consistent.test   |   17 +-
 .../suite/innodb/t/group_commit_binlog_pos.test    |    3 +
 ...group_commit_binlog_pos_no_optimize_thread.test |    4 +-
 mysql-test/suite/innodb/t/innodb-32k-master.opt    |    4 +-
 mysql-test/suite/innodb/t/innodb-32k.test          |   82 +-
 mysql-test/suite/innodb/t/innodb-64k-master.opt    |    4 +-
 mysql-test/suite/innodb/t/innodb-64k.test          |   30 +-
 mysql-test/suite/innodb/t/innodb-alter-table.test  |   59 +
 .../suite/innodb/t/innodb-alter-timestamp.test     |   27 +
 mysql-test/suite/innodb/t/innodb-autoinc.test      |    2 +-
 mysql-test/suite/innodb/t/innodb-bigblob.opt       |    1 +
 mysql-test/suite/innodb/t/innodb-bigblob.test      |    1 +
 .../innodb/t/innodb-change-buffer-recovery.test    |    3 +
 mysql-test/suite/innodb/t/innodb-fk-warnings.test  |  145 +
 mysql-test/suite/innodb/t/innodb.test              |    3 +-
 mysql-test/suite/innodb/t/innodb_bug14147491.test  |   13 +
 .../suite/innodb/t/innodb_bug60229-master.opt      |    1 -
 mysql-test/suite/innodb/t/innodb_bug60229.test     |    4 +
 mysql-test/suite/innodb/t/innodb_bug68148.test     |   41 +
 .../suite/innodb/t/innodb_defrag_binlog.test       |    3 +-
 mysql-test/suite/innodb/t/innodb_force_pk.test     |   11 +
 .../t/innodb_simulate_comp_failures-master.opt     |    2 +-
 .../innodb/t/innodb_simulate_comp_failures.test    |    4 +-
 mysql-test/suite/innodb/t/innodb_uninstall.opt     |    3 +
 mysql-test/suite/innodb/t/innodb_uninstall.test    |   58 +
 mysql-test/suite/innodb/t/xa_recovery.test         |    6 +
 .../r/innodb_prefix_index_liftedlimit.result       |    2 +-
 mysql-test/suite/jp/r/jp_alter_sjis.result         |   72 +-
 mysql-test/suite/jp/r/jp_alter_ucs2.result         |   72 +-
 mysql-test/suite/jp/r/jp_alter_ujis.result         |   72 +-
 mysql-test/suite/jp/r/jp_alter_utf8.result         |   72 +-
 mysql-test/suite/jp/r/jp_convert_ucs2.result       |   42 +-
 mysql-test/suite/jp/r/jp_convert_ujis.result       |  186 +-
 mysql-test/suite/jp/r/jp_convert_utf8.result       |  204 +-
 mysql-test/suite/jp/t/jp_enum_sjis-master.opt      |    1 -
 mysql-test/suite/jp/t/jp_enum_sjis.test            |    4 +
 mysql-test/suite/jp/t/jp_enum_ucs2-master.opt      |    1 -
 mysql-test/suite/jp/t/jp_enum_ucs2.test            |    4 +
 mysql-test/suite/jp/t/jp_enum_ujis-master.opt      |    1 -
 mysql-test/suite/jp/t/jp_enum_ujis.test            |    4 +
 mysql-test/suite/jp/t/jp_enum_utf8-master.opt      |    1 -
 mysql-test/suite/jp/t/jp_enum_utf8.test            |    4 +
 mysql-test/suite/maria/icp.result                  |   20 +-
 mysql-test/suite/maria/maria2.result               |   10 +
 mysql-test/suite/maria/ps_maria.result             |   33 +-
 .../multi_source/gtid_ignore_duplicates.result     |   33 +
 .../suite/multi_source/gtid_ignore_duplicates.test |   34 +
 mysql-test/suite/multi_source/info_logs.result     |    8 +-
 mysql-test/suite/multi_source/info_logs.test       |   13 +-
 mysql-test/suite/multi_source/multisource.result   |   78 +-
 mysql-test/suite/multi_source/multisource.test     |   21 +-
 mysql-test/suite/multi_source/my.cnf               |    1 +
 .../suite/multi_source/relaylog_events.result      |   26 +-
 mysql-test/suite/multi_source/relaylog_events.test |    9 +-
 mysql-test/suite/multi_source/reset_slave.result   |    4 +-
 mysql-test/suite/multi_source/reset_slave.test     |    8 +-
 mysql-test/suite/multi_source/simple.result        |   20 +-
 mysql-test/suite/multi_source/simple.test          |   15 +-
 mysql-test/suite/ndb/r/ndb_restore_discover.result |   33 +
 mysql-test/suite/ndb/t/ndb_restore_discover.test   |   70 +
 .../suite/optimizer_unfixed_bugs/r/bug42991.result |    6 +-
 mysql-test/suite/parts/inc/partition.pre           |    4 +-
 .../suite/parts/inc/partition_auto_increment.inc   |    3 +
 mysql-test/suite/parts/inc/partition_timestamp.inc |    4 +-
 .../parts/r/partition_alter1_1_2_innodb.result     |  296 +-
 .../parts/r/partition_alter1_1_2_myisam.result     |  136 +-
 .../suite/parts/r/partition_alter1_1_innodb.result |  264 +-
 .../suite/parts/r/partition_alter1_1_myisam.result |  168 +-
 .../suite/parts/r/partition_alter1_2_innodb.result |  456 +-
 .../suite/parts/r/partition_alter1_2_myisam.result |  264 +-
 .../parts/r/partition_alter2_1_1_innodb.result     |  280 +-
 .../parts/r/partition_alter2_1_2_innodb.result     |  280 +-
 .../suite/parts/r/partition_alter2_1_maria.result  |  248 +-
 .../suite/parts/r/partition_alter2_1_myisam.result |  248 +-
 .../parts/r/partition_alter2_2_1_innodb.result     |  280 +-
 .../parts/r/partition_alter2_2_2_innodb.result     |  280 +-
 .../suite/parts/r/partition_alter2_2_maria.result  |  248 +-
 .../suite/parts/r/partition_alter2_2_myisam.result |  248 +-
 .../suite/parts/r/partition_alter3_innodb.result   |   64 +-
 .../suite/parts/r/partition_alter3_myisam.result   |   64 +-
 .../suite/parts/r/partition_alter4_innodb.result   | 1608 +++----
 .../suite/parts/r/partition_alter4_myisam.result   | 1608 +++----
 .../suite/parts/r/partition_basic_innodb.result    |  392 +-
 .../suite/parts/r/partition_basic_myisam.result    |  264 +-
 .../parts/r/partition_basic_symlink_myisam.result  |  320 +-
 .../suite/parts/r/partition_bit_innodb.result      |   18 +-
 .../suite/parts/r/partition_bit_myisam.result      |   18 +-
 .../suite/parts/r/partition_datetime_innodb.result |    4 +-
 .../suite/parts/r/partition_datetime_myisam.result |    4 +-
 .../suite/parts/r/partition_engine_innodb.result   |  120 +-
 .../suite/parts/r/partition_engine_myisam.result   |  120 +-
 .../parts/r/partition_exch_qa_1_innodb.result      |    8 +-
 .../parts/r/partition_exch_qa_1_myisam.result      |    8 +-
 .../suite/parts/r/partition_exchange_innodb.result |   16 +-
 .../suite/parts/r/partition_exchange_memory.result |   16 +-
 .../suite/parts/r/partition_exchange_myisam.result |   16 +-
 .../suite/parts/r/partition_special_innodb.result  |    2 +-
 .../suite/parts/r/partition_special_myisam.result  |    2 +-
 .../suite/parts/r/partition_syntax_innodb.result   |  588 +--
 .../suite/parts/r/partition_syntax_myisam.result   |  588 +--
 .../suite/perfschema/include/connection_setup.inc  |    5 +
 .../perfschema/include/event_aggregate_setup.inc   |    5 +-
 .../suite/perfschema/include/stage_setup.inc       |    4 +
 .../perfschema/include/table_aggregate_setup.inc   |    4 +
 .../suite/perfschema/r/column_privilege.result     |    1 +
 .../suite/perfschema/r/digest_null_literal.result  |    6 +-
 .../suite/perfschema/r/digest_table_full.result    |    2 +-
 .../suite/perfschema/r/global_read_lock.result     |    7 +-
 .../r/hostcache_ipv4_addrinfo_again_allow.result   |    1 +
 .../r/hostcache_ipv4_addrinfo_bad_allow.result     |    1 +
 .../r/hostcache_ipv4_addrinfo_good_allow.result    |    1 +
 .../r/hostcache_ipv4_addrinfo_noname_allow.result  |    2 +
 .../perfschema/r/hostcache_ipv4_blocked.result     |    1 +
 .../r/hostcache_ipv4_nameinfo_again_allow.result   |    2 +
 .../r/hostcache_ipv4_nameinfo_noname_allow.result  |    1 +
 .../r/hostcache_ipv6_addrinfo_again_allow.result   |    1 +
 .../r/hostcache_ipv6_addrinfo_bad_allow.result     |    1 +
 .../r/hostcache_ipv6_addrinfo_good_allow.result    |    1 +
 .../r/hostcache_ipv6_addrinfo_noname_allow.result  |    2 +
 .../perfschema/r/hostcache_ipv6_blocked.result     |    1 +
 .../r/hostcache_ipv6_nameinfo_again_allow.result   |    2 +
 .../r/hostcache_ipv6_nameinfo_noname_allow.result  |    1 +
 mysql-test/suite/perfschema/r/misc.result          |   15 +
 mysql-test/suite/perfschema/r/ortho_iter.result    |    1 +
 mysql-test/suite/perfschema/r/privilege.result     |    3 +
 .../suite/perfschema/r/privilege_table_io.result   |    1 +
 mysql-test/suite/perfschema/r/query_cache.result   |    4 +-
 mysql-test/suite/perfschema/r/read_only.result     |    1 +
 mysql-test/suite/perfschema/r/rpl_gtid_func.result |    4 +-
 .../suite/perfschema/r/rpl_statements.result       |   81 +-
 mysql-test/suite/perfschema/r/setup_actors.result  |    5 +
 .../suite/perfschema/r/sizing_default.result       |    1 +
 mysql-test/suite/perfschema/r/sizing_high.result   |    1 +
 mysql-test/suite/perfschema/r/sizing_low.result    |    1 +
 mysql-test/suite/perfschema/r/sizing_med.result    |    1 +
 mysql-test/suite/perfschema/r/sizing_off.result    |    1 +
 .../r/socket_summary_by_instance_func.result       |    2 +
 .../suite/perfschema/r/stage_mdl_global.result     |    2 +
 .../perfschema/r/start_server_disable_idle.result  |    1 +
 .../r/start_server_disable_stages.result           |    1 +
 .../r/start_server_disable_statements.result       |    1 +
 .../perfschema/r/start_server_disable_waits.result |    1 +
 .../suite/perfschema/r/start_server_innodb.result  |    1 +
 .../perfschema/r/start_server_no_account.result    |    1 +
 .../perfschema/r/start_server_no_cond_class.result |    1 +
 .../perfschema/r/start_server_no_cond_inst.result  |    1 +
 .../perfschema/r/start_server_no_file_class.result |    1 +
 .../perfschema/r/start_server_no_file_inst.result  |    1 +
 .../suite/perfschema/r/start_server_no_host.result |    1 +
 .../r/start_server_no_mutex_class.result           |    1 +
 .../perfschema/r/start_server_no_mutex_inst.result |    1 +
 .../r/start_server_no_rwlock_class.result          |    1 +
 .../r/start_server_no_rwlock_inst.result           |    1 +
 .../r/start_server_no_setup_actors.result          |    1 +
 .../r/start_server_no_setup_objects.result         |    1 +
 .../r/start_server_no_socket_class.result          |    1 +
 .../r/start_server_no_socket_inst.result           |    1 +
 .../r/start_server_no_stage_class.result           |    1 +
 .../r/start_server_no_stages_history.result        |    1 +
 .../r/start_server_no_stages_history_long.result   |    1 +
 .../r/start_server_no_statement_class.result       |    1 +
 .../r/start_server_no_statements_history.result    |    1 +
 .../start_server_no_statements_history_long.result |    1 +
 .../perfschema/r/start_server_no_table_hdl.result  |    1 +
 .../perfschema/r/start_server_no_table_inst.result |    1 +
 .../r/start_server_no_thread_class.result          |    1 +
 .../r/start_server_no_thread_inst.result           |    1 +
 .../suite/perfschema/r/start_server_no_user.result |    1 +
 .../r/start_server_no_waits_history.result         |    1 +
 .../r/start_server_no_waits_history_long.result    |    1 +
 .../suite/perfschema/r/start_server_nothing.result |    2 +
 .../suite/perfschema/r/start_server_off.result     |    1 +
 .../suite/perfschema/r/start_server_on.result      |    1 +
 .../suite/perfschema/r/statement_digest.result     |   65 +-
 .../perfschema/r/statement_digest_consumers.result |   65 +-
 .../r/statement_digest_long_query.result           |    2 +-
 .../r/table_aggregate_global_2u_2t.result          |    1 +
 .../r/table_aggregate_global_2u_3t.result          |    1 +
 .../r/table_aggregate_global_4u_2t.result          |    1 +
 .../r/table_aggregate_global_4u_3t.result          |    1 +
 .../perfschema/r/table_aggregate_hist_2u_2t.result |    1 +
 .../perfschema/r/table_aggregate_hist_2u_3t.result |    1 +
 .../perfschema/r/table_aggregate_hist_4u_2t.result |    1 +
 .../perfschema/r/table_aggregate_hist_4u_3t.result |    1 +
 .../suite/perfschema/r/table_aggregate_off.result  |    1 +
 .../r/table_aggregate_thread_2u_2t.result          |    1 +
 .../r/table_aggregate_thread_2u_3t.result          |    1 +
 .../r/table_aggregate_thread_4u_2t.result          |    1 +
 .../r/table_aggregate_thread_4u_3t.result          |    1 +
 .../r/table_io_aggregate_global_2u_2t.result       |    1 +
 .../r/table_io_aggregate_global_2u_3t.result       |    1 +
 .../r/table_io_aggregate_global_4u_2t.result       |    1 +
 .../r/table_io_aggregate_global_4u_3t.result       |    1 +
 .../r/table_io_aggregate_hist_2u_2t.result         |    1 +
 .../r/table_io_aggregate_hist_2u_3t.result         |    1 +
 .../r/table_io_aggregate_hist_4u_2t.result         |    1 +
 .../r/table_io_aggregate_hist_4u_3t.result         |    1 +
 .../r/table_io_aggregate_thread_2u_2t.result       |    1 +
 .../r/table_io_aggregate_thread_2u_3t.result       |    1 +
 .../r/table_io_aggregate_thread_4u_2t.result       |    1 +
 .../r/table_io_aggregate_thread_4u_3t.result       |    1 +
 .../r/table_lock_aggregate_global_2u_2t.result     |    1 +
 .../r/table_lock_aggregate_global_2u_3t.result     |    1 +
 .../r/table_lock_aggregate_global_4u_2t.result     |    1 +
 .../r/table_lock_aggregate_global_4u_3t.result     |    1 +
 .../r/table_lock_aggregate_hist_2u_2t.result       |    1 +
 .../r/table_lock_aggregate_hist_2u_3t.result       |    1 +
 .../r/table_lock_aggregate_hist_4u_2t.result       |    1 +
 .../r/table_lock_aggregate_hist_4u_3t.result       |    1 +
 .../r/table_lock_aggregate_thread_2u_2t.result     |    1 +
 .../r/table_lock_aggregate_thread_2u_3t.result     |    1 +
 .../r/table_lock_aggregate_thread_4u_2t.result     |    1 +
 .../r/table_lock_aggregate_thread_4u_3t.result     |    1 +
 mysql-test/suite/perfschema/r/unary_digest.result  |   12 +-
 .../suite/perfschema/t/column_privilege.test       |    1 +
 .../suite/perfschema/t/global_read_lock.test       |    5 +-
 .../t/hostcache_ipv4_addrinfo_again_allow.test     |    1 +
 .../t/hostcache_ipv4_addrinfo_bad_allow.test       |    1 +
 .../t/hostcache_ipv4_addrinfo_good_allow.test      |    1 +
 .../t/hostcache_ipv4_addrinfo_noname_allow.test    |    2 +
 .../suite/perfschema/t/hostcache_ipv4_blocked.test |    1 +
 .../t/hostcache_ipv4_nameinfo_again_allow.test     |    2 +
 .../t/hostcache_ipv4_nameinfo_noname_allow.test    |    1 +
 .../t/hostcache_ipv6_addrinfo_again_allow.test     |    1 +
 .../t/hostcache_ipv6_addrinfo_bad_allow.test       |    1 +
 .../t/hostcache_ipv6_addrinfo_good_allow.test      |    1 +
 .../t/hostcache_ipv6_addrinfo_noname_allow.test    |    2 +
 .../suite/perfschema/t/hostcache_ipv6_blocked.test |    1 +
 .../t/hostcache_ipv6_nameinfo_again_allow.test     |    2 +
 .../t/hostcache_ipv6_nameinfo_noname_allow.test    |    1 +
 mysql-test/suite/perfschema/t/misc.test            |   20 +
 mysql-test/suite/perfschema/t/nesting.test         |    1 +
 mysql-test/suite/perfschema/t/privilege.test       |    4 +-
 mysql-test/suite/perfschema/t/query_cache.test     |    2 +
 mysql-test/suite/perfschema/t/read_only.test       |    1 +
 mysql-test/suite/perfschema/t/setup_actors.test    |    5 +
 .../t/socket_summary_by_instance_func.test         |    2 +
 mysql-test/suite/plugins/r/audit_null.result       |    1 +
 mysql-test/suite/plugins/r/auth_v0100.result       |    1 +
 .../suite/plugins/r/feedback_plugin_load.result    |    8 +-
 .../suite/plugins/r/feedback_plugin_send.result    |    8 +-
 mysql-test/suite/plugins/r/locales.result          |    8 +-
 mysql-test/suite/plugins/r/qc_info.result          |   23 +-
 mysql-test/suite/plugins/r/qc_info_priv.result     |   21 +
 mysql-test/suite/plugins/t/audit_null.test         |    1 +
 mysql-test/suite/plugins/t/auth_v0100.test         |    1 +
 .../suite/plugins/t/feedback_plugin_load.test      |   20 +-
 .../suite/plugins/t/feedback_plugin_send.test      |    9 +
 mysql-test/suite/plugins/t/qc_info.test            |    1 +
 mysql-test/suite/plugins/t/qc_info_init.inc        |   23 +
 mysql-test/suite/plugins/t/qc_info_priv.test       |    2 +-
 mysql-test/suite/plugins/t/show_all_plugins.test   |    1 +
 mysql-test/suite/roles/admin.result                |    1 +
 mysql-test/suite/roles/admin.test                  |    2 +-
 .../suite/roles/create_and_drop_current.result     |    1 +
 .../suite/roles/create_and_drop_current.test       |    1 +
 mysql-test/suite/roles/definer.result              |   52 +-
 mysql-test/suite/roles/definer.test                |    2 +
 .../suite/roles/drop_current_user-5176.result      |    1 +
 mysql-test/suite/roles/drop_current_user-5176.test |    1 +
 mysql-test/suite/roles/grant-5771.result           |    1 +
 mysql-test/suite/roles/grant-5771.test             |    1 +
 .../suite/roles/grant_role_auto_create_user.result |    6 +-
 .../suite/roles/grant_role_auto_create_user.test   |    8 +-
 mysql-test/suite/roles/password.result             |    1 +
 mysql-test/suite/roles/password.test               |    1 +
 mysql-test/suite/roles/rpl_definer.result          |   16 +-
 mysql-test/suite/rpl/include/hrtime.inc            |    2 +-
 .../suite/rpl/r/create_or_replace_mix.result       |    7 -
 .../suite/rpl/r/create_or_replace_row.result       |   15 +-
 .../suite/rpl/r/create_or_replace_statement.result |    4 -
 mysql-test/suite/rpl/r/create_select.result        |   30 +
 mysql-test/suite/rpl/r/rpl_alter.result            |  105 +
 mysql-test/suite/rpl/r/rpl_binlog_grant.result     |    1 +
 mysql-test/suite/rpl/r/rpl_checksum.result         |    2 +-
 .../suite/rpl/r/rpl_create_drop_function.result    |    2 +-
 mysql-test/suite/rpl/r/rpl_create_drop_role.result |    4 +-
 mysql-test/suite/rpl/r/rpl_create_drop_user.result |    2 +-
 mysql-test/suite/rpl/r/rpl_current_user.result     |    1 +
 mysql-test/suite/rpl/r/rpl_ddl.result              |    3 +
 mysql-test/suite/rpl/r/rpl_do_grant.result         |    7 +-
 mysql-test/suite/rpl/r/rpl_domain_id_filter.result |    4 +
 .../suite/rpl/r/rpl_extra_col_slave_innodb.result  |    3 +-
 .../suite/rpl/r/rpl_extra_col_slave_myisam.result  |    3 +-
 mysql-test/suite/rpl/r/rpl_gtid_mdev4820.result    |    2 +
 mysql-test/suite/rpl/r/rpl_hrtime.result           |    6 +-
 mysql-test/suite/rpl/r/rpl_hrtime_row.result       |    2 +-
 mysql-test/suite/rpl/r/rpl_ignore_grant.result     |    6 +
 mysql-test/suite/rpl/r/rpl_ignore_table.result     |    2 +
 mysql-test/suite/rpl/r/rpl_innodb_bug28430.result  |    9 +-
 mysql-test/suite/rpl/r/rpl_mdev382.result          |    2 +-
 mysql-test/suite/rpl/r/rpl_mdev8193.result         |   24 +
 mysql-test/suite/rpl/r/rpl_multi_engine.result     |    3 +-
 .../rpl/r/rpl_non_direct_row_mixing_engines.result |  116 +-
 mysql-test/suite/rpl/r/rpl_parallel.result         |   58 +
 mysql-test/suite/rpl/r/rpl_replicate_do.result     |    6 +-
 mysql-test/suite/rpl/r/rpl_rewrt_db.result         |    6 +
 mysql-test/suite/rpl/r/rpl_row_USER.result         |    4 +
 mysql-test/suite/rpl/r/rpl_row_UUID.result         |    2 +-
 mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result |    2 +-
 .../suite/rpl/r/rpl_row_basic_8partition.result    |    8 +-
 .../suite/rpl/r/rpl_row_create_select.result       |    4 +-
 mysql-test/suite/rpl/r/rpl_row_create_table.result |    2 +-
 mysql-test/suite/rpl/r/rpl_row_drop.result         |    4 -
 .../rpl/r/rpl_row_drop_create_temp_table.result    |  250 +-
 mysql-test/suite/rpl/r/rpl_row_img_blobs.result    | 4733 ++++++++++++++++++++
 mysql-test/suite/rpl/r/rpl_row_img_eng_min.result  | 3516 +++++++++++++++
 .../suite/rpl/r/rpl_row_img_eng_noblob.result      | 3516 +++++++++++++++
 .../rpl/r/rpl_row_implicit_commit_binlog.result    |    1 -
 .../suite/rpl/r/rpl_row_mixing_engines.result      |  116 +-
 mysql-test/suite/rpl/r/rpl_row_reset_slave.result  |    2 +-
 mysql-test/suite/rpl/r/rpl_row_sp012.result        |    2 +
 mysql-test/suite/rpl/r/rpl_row_to_stmt.result      |   28 +
 mysql-test/suite/rpl/r/rpl_row_triggers_sbr.result |   14 -
 mysql-test/suite/rpl/r/rpl_row_until.result        |    8 +-
 .../rpl/r/rpl_semi_sync_after_sync_row.result      |   10 +-
 mysql-test/suite/rpl/r/rpl_set_statement.result    |    2 +
 mysql-test/suite/rpl/r/rpl_sp.result               |    3 +
 mysql-test/suite/rpl/r/rpl_ssl.result              |    1 +
 mysql-test/suite/rpl/r/rpl_ssl1.result             |    1 +
 mysql-test/suite/rpl/r/rpl_stm_reset_slave.result  |    2 +-
 mysql-test/suite/rpl/r/rpl_stm_until.result        |   10 +-
 .../suite/rpl/r/rpl_temp_table_mix_row.result      |    4 +-
 mysql-test/suite/rpl/t/create_select.cnf           |   16 +
 mysql-test/suite/rpl/t/create_select.test          |   41 +
 mysql-test/suite/rpl/t/rpl_alter.test              |   53 +
 mysql-test/suite/rpl/t/rpl_binlog_grant.test       |    1 +
 mysql-test/suite/rpl/t/rpl_current_user.test       |    2 +-
 mysql-test/suite/rpl/t/rpl_do_grant.test           |    1 +
 mysql-test/suite/rpl/t/rpl_domain_id_filter.test   |    8 +-
 mysql-test/suite/rpl/t/rpl_gtid_mdev4820.test      |    4 +-
 mysql-test/suite/rpl/t/rpl_ignore_grant.test       |    7 +
 mysql-test/suite/rpl/t/rpl_ignore_table.test       |    3 +-
 mysql-test/suite/rpl/t/rpl_innodb_bug28430.test    |    9 +-
 mysql-test/suite/rpl/t/rpl_innodb_bug30888.opt     |    1 +
 mysql-test/suite/rpl/t/rpl_mdev8193.test           |   56 +
 mysql-test/suite/rpl/t/rpl_multi_engine.test       |    3 +-
 mysql-test/suite/rpl/t/rpl_parallel.test           |   76 +
 mysql-test/suite/rpl/t/rpl_row_USER.test           |    5 +
 mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test   |    2 +-
 mysql-test/suite/rpl/t/rpl_row_img.cnf             |   21 +
 mysql-test/suite/rpl/t/rpl_row_img_blobs.cnf       |    1 +
 mysql-test/suite/rpl/t/rpl_row_img_blobs.test      |   59 +
 mysql-test/suite/rpl/t/rpl_row_img_eng_min.cnf     |    1 +
 mysql-test/suite/rpl/t/rpl_row_img_eng_min.test    |   39 +
 mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.cnf  |    1 +
 mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test |   39 +
 mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test    |    1 +
 mysql-test/suite/rpl/t/rpl_row_sp012.test          |    2 +
 mysql-test/suite/rpl/t/rpl_row_to_stmt-master.opt  |    1 +
 mysql-test/suite/rpl/t/rpl_row_to_stmt-slave.opt   |    1 +
 mysql-test/suite/rpl/t/rpl_row_to_stmt.test        |   23 +
 mysql-test/suite/rpl/t/rpl_row_triggers_sbr.test   |   43 -
 mysql-test/suite/rpl/t/rpl_row_until.test          |   15 +-
 mysql-test/suite/rpl/t/rpl_set_statement.test      |    4 +
 mysql-test/suite/rpl/t/rpl_sp.test                 |    3 +
 mysql-test/suite/rpl/t/rpl_ssl.test                |    1 +
 mysql-test/suite/rpl/t/rpl_ssl1.test               |    1 +
 mysql-test/suite/rpl/t/rpl_stm_until.test          |    5 -
 .../suite/rpl/t/rpl_switch_stm_row_mixed.test      |    2 +
 mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test |    2 +
 mysql-test/suite/storage_engine/foreign_keys.test  |    4 +-
 mysql-test/suite/storage_engine/select.result      |    5 +-
 mysql-test/suite/storage_engine/select.test        |    6 +-
 .../suite/storage_engine/type_spatial.result       |    4 +-
 .../storage_engine/type_spatial_indexes.result     |    8 +-
 .../inc/explicit_defaults_for_timestamp.inc        |   99 +
 mysql-test/suite/sys_vars/r/all_vars.result        |    1 +
 mysql-test/suite/sys_vars/r/back_log_basic.result  |   10 +-
 .../suite/sys_vars/r/binlog_row_image_basic.result |  100 +
 .../suite/sys_vars/r/debug_crc_break_basic.result  |   39 -
 .../r/explicit_defaults_for_timestamp_basic.result |   21 +
 .../r/explicit_defaults_for_timestamp_off.result   |  175 +
 .../r/explicit_defaults_for_timestamp_on.result    |  180 +
 .../sys_vars/r/innodb_monitor_disable_basic.result |    2 +
 .../sys_vars/r/innodb_monitor_enable_basic.result  |    2 +
 .../r/innodb_monitor_reset_all_basic.result        |    2 +
 .../sys_vars/r/innodb_monitor_reset_basic.result   |    2 +
 .../suite/sys_vars/r/join_buffer_size_basic.result |   12 +-
 .../sys_vars/r/max_allowed_packet_basic.result     |   34 +-
 .../sys_vars/r/max_allowed_packet_func.result      |    2 +-
 .../sys_vars/r/max_user_connections_func.result    |    1 +
 .../suite/sys_vars/r/query_cache_limit_func.result |    2 +
 .../suite/sys_vars/r/query_cache_size_basic.result |    2 +-
 .../suite/sys_vars/r/query_cache_type_basic.result |   12 +-
 .../suite/sys_vars/r/query_cache_type_func.result  |    7 +-
 .../r/query_cache_wlock_invalidate_func.result     |    3 +
 .../suite/sys_vars/r/secure_auth_basic.result      |    8 +-
 mysql-test/suite/sys_vars/r/sql_mode_basic.result  |   12 +-
 .../suite/sys_vars/r/sync_master_info_basic.result |   14 +-
 .../suite/sys_vars/r/sync_relay_log_basic.result   |   14 +-
 .../sys_vars/r/sync_relay_log_info_basic.result    |   14 +-
 mysql-test/suite/sys_vars/r/sysvars_aria.result    |    2 +-
 mysql-test/suite/sys_vars/r/sysvars_debug.result   |   14 -
 .../sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff   |    4 +-
 .../suite/sys_vars/r/sysvars_innodb,xtradb.rdiff   |    4 +-
 mysql-test/suite/sys_vars/r/sysvars_innodb.result  |    6 +-
 .../sys_vars/r/sysvars_server_embedded,32bit.rdiff |  282 +-
 .../sys_vars/r/sysvars_server_embedded.result      |  150 +-
 .../r/sysvars_server_notembedded,32bit.rdiff       |  288 +-
 .../sys_vars/r/sysvars_server_notembedded.result   |  164 +-
 mysql-test/suite/sys_vars/r/sysvars_wsrep.result   |    4 +-
 .../suite/sys_vars/r/table_open_cache_basic.result |    8 +-
 .../suite/sys_vars/r/wsrep_desync_basic.result     |    8 +-
 .../suite/sys_vars/r/wsrep_osu_method_basic.result |    3 +-
 .../sys_vars/r/wsrep_provider_options_basic.result |    2 +-
 .../suite/sys_vars/t/binlog_row_image_basic.test   |  129 +
 .../suite/sys_vars/t/debug_crc_break_basic.test    |   46 -
 .../t/explicit_defaults_for_timestamp_basic.test   |   26 +
 .../t/explicit_defaults_for_timestamp_off.test     |    8 +
 .../explicit_defaults_for_timestamp_on-master.opt  |    1 +
 .../t/explicit_defaults_for_timestamp_on.test      |    8 +
 .../sys_vars/t/max_user_connections_func.test      |    1 +
 .../suite/sys_vars/t/query_cache_limit_func.test   |    3 +
 .../suite/sys_vars/t/query_cache_type_func.test    |    5 +-
 .../t/query_cache_wlock_invalidate_func.test       |    5 +
 .../sys_vars/t/wsrep_cluster_address_basic.test    |    1 +
 .../suite/sys_vars/t/wsrep_desync_basic.test       |   12 +-
 .../suite/sys_vars/t/wsrep_osu_method_basic.test   |    1 -
 .../sys_vars/t/wsrep_provider_options_basic.test   |    7 +-
 .../suite/vcol/inc/vcol_blocked_sql_funcs_main.inc |   12 +
 .../vcol/inc/vcol_supported_sql_funcs_main.inc     |   18 -
 mysql-test/suite/vcol/r/load_data.result           |   20 +
 .../vcol/r/vcol_blocked_sql_funcs_innodb.result    |    9 +
 .../vcol/r/vcol_blocked_sql_funcs_myisam.result    |    9 +
 mysql-test/suite/vcol/r/vcol_misc.result           |   47 +-
 .../vcol/r/vcol_supported_sql_funcs_innodb.result  |   49 +-
 .../vcol/r/vcol_supported_sql_funcs_myisam.result  |   49 +-
 mysql-test/suite/vcol/t/load_data.test             |   13 +
 mysql-test/suite/vcol/t/vcol_misc.test             |   33 +-
 mysql-test/suite/wsrep/disabled.def                |    1 +
 mysql-test/suite/wsrep/my.cnf                      |    2 +-
 mysql-test/suite/wsrep/r/mdev_7798.result          |   13 +
 mysql-test/suite/wsrep/r/variables.result          |    8 +
 mysql-test/suite/wsrep/suite.pm                    |    9 +-
 mysql-test/suite/wsrep/t/mdev_7798.opt             |    1 +
 mysql-test/suite/wsrep/t/mdev_7798.test            |   17 +
 mysql-test/suite/wsrep/t/variables.test            |    2 +-
 mysql-test/t/alter_table.test                      |    4 +
 mysql-test/t/alter_table_online.test               |  167 +
 mysql-test/t/analyze_format_json.test              |   62 +
 mysql-test/t/analyze_stmt_orderby.test             |   27 +-
 mysql-test/t/analyze_stmt_privileges.test          |    1 +
 mysql-test/t/analyze_stmt_privileges2.test         |    3 +
 mysql-test/t/blackhole_plugin.test                 |    5 +-
 mysql-test/t/bootstrap.test                        |    1 +
 mysql-test/t/case.test                             |   72 +
 mysql-test/t/change_user.test                      |   12 +-
 mysql-test/t/connect.test                          |    5 +
 mysql-test/t/create.test                           |    6 +-
 mysql-test/t/create_drop_binlog.test               |   34 +
 mysql-test/t/create_or_replace_permission.test     |    5 +
 mysql-test/t/ctype_binary.test                     |   47 +
 mysql-test/t/ctype_cp1250_ch.test                  |    1 +
 mysql-test/t/ctype_cp1251.test                     |   35 +
 mysql-test/t/ctype_eucjpms.test                    |   25 +
 mysql-test/t/ctype_latin1.test                     |  128 +
 mysql-test/t/ctype_latin2_ch.test                  |    3 +
 mysql-test/t/ctype_many.test                       |   19 +
 mysql-test/t/ctype_tis620.test                     |    2 +
 mysql-test/t/ctype_uca.test                        |   12 +
 mysql-test/t/ctype_ucs.test                        |   19 +-
 mysql-test/t/ctype_ujis.test                       |   27 +
 mysql-test/t/ctype_utf16.test                      |   28 +
 mysql-test/t/ctype_utf16le.test                    |   28 +
 mysql-test/t/ctype_utf32.test                      |   17 +
 mysql-test/t/ctype_utf8.test                       |   25 +
 mysql-test/t/ddl_i18n_koi8r.test                   |    2 +
 mysql-test/t/ddl_i18n_utf8.test                    |    2 +
 mysql-test/t/default.test                          |    2 +
 mysql-test/t/delete_returning_grant.test           |    4 +
 mysql-test/t/derived.test                          |   69 +-
 mysql-test/t/derived_view.test                     |    4 +-
 mysql-test/t/distinct.test                         |    2 +-
 mysql-test/t/empty_server_name-8224.test           |    4 +
 mysql-test/t/enforce_storage_engine.test           |   25 +
 mysql-test/t/enforce_storage_engine_opt.test       |    1 +
 mysql-test/t/events_1.test                         |    5 +-
 mysql-test/t/events_2.test                         |    2 +
 mysql-test/t/events_bugs.test                      |    2 +-
 mysql-test/t/events_trans.test                     |    2 +
 mysql-test/t/events_trans_notembedded.test         |    1 +
 mysql-test/t/explain_json.test                     |  117 +
 mysql-test/t/explain_non_select.test               |   42 +
 mysql-test/t/features.test                         |    2 +
 mysql-test/t/fix_priv_tables.test                  |    2 +
 mysql-test/t/flush-innodb-notembedded.test         |    2 +
 mysql-test/t/flush_read_lock.test                  |    3 +
 mysql-test/t/func_compress.test                    |    7 +
 mysql-test/t/func_encrypt.test                     |   18 +
 mysql-test/t/func_gconcat.test                     |   11 +
 mysql-test/t/func_group.test                       |   46 +
 mysql-test/t/func_hybrid_type.test                 |  438 ++
 mysql-test/t/func_if.test                          |   14 +
 mysql-test/t/func_in.test                          |   13 +
 mysql-test/t/func_like.test                        |   19 +
 mysql-test/t/func_math.test                        |    2 +
 mysql-test/t/func_misc.test                        |  214 +-
 mysql-test/t/func_str.test                         |   39 +-
 mysql-test/t/func_test.test                        |   18 +
 mysql-test/t/func_time.test                        |    6 +-
 mysql-test/t/func_weight_string.test               |   36 +
 mysql-test/t/gis-alter_table_online.test           |   82 +
 mysql-test/t/gis-rtree.test                        |   14 +
 mysql-test/t/gis.test                              |    7 +
 mysql-test/t/grant.test                            |   28 +-
 mysql-test/t/grant2.test                           |    3 +
 mysql-test/t/grant3.test                           |    3 +
 mysql-test/t/grant4.test                           |    5 +
 mysql-test/t/grant_4332.test                       |    3 +
 mysql-test/t/grant_explain_non_select.test         |    5 +
 mysql-test/t/grant_lowercase.test                  |    9 +-
 mysql-test/t/grant_lowercase_fs.test               |    2 +
 mysql-test/t/group_by.test                         |   30 +-
 mysql-test/t/group_min_max.test                    |   11 +
 mysql-test/t/help.test                             |    2 +
 mysql-test/t/host_cache_size_functionality.test    |    2 +-
 mysql-test/t/implicit_commit.test                  |    2 +
 mysql-test/t/index_intersect.test                  |    2 +-
 mysql-test/t/information_schema.test               |    3 +
 mysql-test/t/information_schema2.test              |   19 +-
 mysql-test/t/information_schema_db.test            |    5 +
 mysql-test/t/information_schema_linux.test         |   10 +
 mysql-test/t/information_schema_routines.test      |    2 +
 mysql-test/t/innodb_load_xa.test                   |    3 +
 mysql-test/t/insert.test                           |    2 +-
 mysql-test/t/insert_notembedded.test               |    6 +
 mysql-test/t/join_cache.test                       |   34 +
 mysql-test/t/key.test                              |    2 +-
 mysql-test/t/kill.test                             |   30 +
 mysql-test/t/loadxml.test                          |   14 +
 mysql-test/t/lock_multi.test                       |    2 +
 mysql-test/t/log_tables.test                       |    1 +
 mysql-test/t/lowercase_fs_off.test                 |    4 +
 mysql-test/t/lowercase_fs_on.test                  |   38 +
 mysql-test/t/lowercase_table3-master.opt           |    1 -
 mysql-test/t/lowercase_table3.test                 |   37 -
 mysql-test/t/lowercase_table4.test                 |    3 +
 mysql-test/t/lowercase_table_grant.test            |    1 +
 mysql-test/t/lowercase_table_qcache.test           |    5 +-
 mysql-test/t/max_statement_time.test               |    6 +
 mysql-test/t/mdev-504.test                         |    4 +-
 mysql-test/t/merge.test                            |   13 +-
 mysql-test/t/merge_recover-master.opt              |    1 -
 mysql-test/t/merge_recover.test                    |  113 -
 mysql-test/t/metadata.test                         |    4 +-
 mysql-test/t/multi_update.test                     |    5 +-
 mysql-test/t/myisam-optimize.test                  |   58 +
 mysql-test/t/myisam_recover-master.opt             |    1 +
 mysql-test/t/myisam_recover.test                   |  180 +
 mysql-test/t/mysql.test                            |    3 +
 mysql-test/t/mysql_comments.test                   |    4 +
 mysql-test/t/mysql_upgrade.test                    |   27 +-
 mysql-test/t/mysqlbinlog-innodb.test               |    1 -
 mysql-test/t/mysqldump-max.test                    |    8 +-
 mysql-test/t/mysqldump.test                        |   46 +-
 mysql-test/t/null.test                             |   41 +
 mysql-test/t/openssl_1.test                        |    3 +
 mysql-test/t/openssl_6975.test                     |    2 +
 mysql-test/t/parser.test                           |  256 ++
 mysql-test/t/partition_alter.test                  |   66 +
 mysql-test/t/partition_error.test                  |    2 +-
 mysql-test/t/partition_grant.test                  |    1 +
 mysql-test/t/partition_hash.test                   |    2 +
 mysql-test/t/partition_innodb.test                 |    2 +
 mysql-test/t/plugin.test                           |    4 +-
 mysql-test/t/plugin_auth.test                      |    6 +-
 mysql-test/t/plugin_auth_qa.test                   |    3 +
 mysql-test/t/plugin_not_embedded.test              |    2 +-
 mysql-test/t/ps.test                               |    1 +
 mysql-test/t/ps_4heap.test                         |    3 +-
 mysql-test/t/ps_5merge.test                        |    4 +-
 mysql-test/t/query_cache.test                      |   14 +-
 mysql-test/t/query_cache_debug.test                |    1 +
 mysql-test/t/query_cache_merge.test                |    6 +-
 mysql-test/t/query_cache_notembedded-master.opt    |    1 +
 mysql-test/t/query_cache_notembedded.test          |   14 +-
 mysql-test/t/query_cache_with_views.test           |    4 +-
 mysql-test/t/range.test                            |   30 +
 mysql-test/t/read_only.test                        |    4 +-
 mysql-test/t/read_only_innodb.test                 |    3 +
 mysql-test/t/repair_symlink-5543.test              |    1 -
 mysql-test/t/row.test                              |   18 +
 mysql-test/t/select.test                           |    6 +-
 mysql-test/t/selectivity.test                      |    6 +-
 mysql-test/t/selectivity_no_engine.test            |   17 +
 mysql-test/t/servers.test                          |    3 +-
 mysql-test/t/set_statement.test                    |    1 +
 mysql-test/t/show_check.test                       |    6 +-
 mysql-test/t/show_explain.test                     |    2 +-
 mysql-test/t/single_delete_update.test             |   27 -
 mysql-test/t/single_delete_update_innodb.test      |   30 +
 mysql-test/t/skip_name_resolve.test                |    1 +
 mysql-test/t/sp-error.test                         |    4 +-
 mysql-test/t/sp-group.test                         |  187 +
 mysql-test/t/sp-security.test                      |   13 +-
 mysql-test/t/sp.test                               |   70 +-
 mysql-test/t/sp_notembedded.test                   |    2 +-
 mysql-test/t/sp_trans.test                         |    2 +
 mysql-test/t/sql_mode.test                         |    2 +-
 mysql-test/t/stack-crash.test                      |    4 +-
 mysql-test/t/stat_tables_rbr.test                  |    3 +-
 mysql-test/t/status.test                           |    1 +
 mysql-test/t/strict.test                           |   16 +-
 mysql-test/t/subselect.test                        |   84 +-
 mysql-test/t/subselect_cache.test                  |   10 +
 mysql-test/t/subselect_sj.test                     |    2 +-
 mysql-test/t/subselect_sj2.test                    |   58 +
 mysql-test/t/subselect_sj_mat.test                 |   42 +-
 mysql-test/t/system_mysql_db_fix40123.test         |   82 +
 mysql-test/t/system_mysql_db_fix50030.test         |   89 +
 mysql-test/t/system_mysql_db_fix50117.test         |   10 +-
 mysql-test/t/table_elim.test                       |    4 +-
 mysql-test/t/timezone_grant.test                   |    2 +
 mysql-test/t/trigger-compat.test                   |    1 -
 mysql-test/t/trigger_notembedded.test              |    2 +-
 mysql-test/t/type_binary.test                      |   26 +
 mysql-test/t/type_date.test                        |  163 +
 mysql-test/t/type_datetime.test                    |   76 +-
 mysql-test/t/type_enum.test                        |   31 +
 mysql-test/t/type_float.test                       |   73 +
 mysql-test/t/type_int.test                         |   28 +
 mysql-test/t/type_newdecimal.test                  |   65 +
 mysql-test/t/type_num.test                         |  683 +++
 mysql-test/t/type_ranges.test                      |    2 +-
 mysql-test/t/type_set.test                         |   32 +
 mysql-test/t/type_time.test                        |  450 ++
 mysql-test/t/type_timestamp.test                   |   52 +-
 mysql-test/t/type_timestamp_hires.test             |    2 +-
 mysql-test/t/type_year.test                        |   22 +
 mysql-test/t/union.test                            |   39 +-
 mysql-test/t/update.test                           |   15 +
 mysql-test/t/user_limits.test                      |    5 +
 mysql-test/t/variables.test                        |    2 +
 mysql-test/t/view.test                             |  143 +-
 mysql-test/t/view_debug.test                       |   37 +
 mysql-test/t/view_grant.test                       |   34 +-
 mysql-test/t/warnings_engine_disabled.test         |    2 +
 mysql-test/t/xml.test                              |    2 +
 mysql-test/valgrind.supp                           |   11 +-
 mysys/checksum.c                                   |    4 -
 mysys/ma_dyncol.c                                  |    7 +-
 mysys/mf_iocache.c                                 |    2 +-
 mysys/mf_keycache.c                                |   38 +-
 mysys/mulalloc.c                                   |   44 +
 mysys/my_addr_resolve.c                            |    2 +-
 mysys/my_alloc.c                                   |    5 +-
 mysys/my_create.c                                  |    2 +-
 mysys/my_fopen.c                                   |    8 +-
 mysys/my_getopt.c                                  |   59 +-
 mysys/my_open.c                                    |    4 +-
 mysys/my_rdtsc.c                                   |    7 +-
 mysys/my_thr_init.c                                |    2 +
 mysys/ptr_cmp.c                                    |    3 +-
 mysys/thr_alarm.c                                  |   12 +-
 mysys/thr_lock.c                                   |   18 +-
 mysys_ssl/my_crypt.cc                              |  449 +-
 mysys_ssl/yassl.cc                                 |  194 +
 packaging/WiX/AdminBackground.jpg                  |  Bin 20557 -> 0 bytes
 packaging/WiX/AdminHeader.jpg                      |  Bin 3469 -> 0 bytes
 packaging/WiX/CMakeLists.txt                       |  119 -
 packaging/WiX/CPackWixConfig.cmake                 |  119 -
 packaging/WiX/MySQLServer.ico                      |  Bin 22486 -> 0 bytes
 packaging/WiX/ca/CMakeLists.txt                    |   55 -
 packaging/WiX/ca/CustomAction.cpp                  |  188 -
 packaging/WiX/ca/CustomAction.def                  |    8 -
 packaging/WiX/create_msi.cmake.in                  |  398 --
 packaging/WiX/custom_ui.wxs                        |  115 -
 packaging/WiX/extra.wxs.in                         |   81 -
 packaging/WiX/mysql_server.wxs.in                  |  196 -
 packaging/solaris/CMakeLists.txt                   |   35 -
 packaging/solaris/postinstall-solaris.sh           |  123 -
 pcre/testdata/greppatN4                            |    2 +-
 plugin/auth_pam/auth_pam.c                         |    3 +-
 plugin/auth_pam/mapper/pam_user_map.c              |   81 +-
 .../debug_key_management_plugin.cc                 |    3 +-
 .../example_key_management_plugin.cc               |   35 +-
 plugin/feedback/feedback.cc                        |   28 +-
 plugin/feedback/feedback.h                         |    6 +
 plugin/feedback/url_base.cc                        |   46 +
 plugin/feedback/url_http.cc                        |   49 +-
 .../file_key_management_plugin.cc                  |   92 +-
 plugin/file_key_management/parser.cc               |   21 +-
 plugin/handler_socket/handlersocket/database.cpp   |    8 +-
 plugin/qc_info/qc_info.cc                          |   87 +-
 scripts/CMakeLists.txt                             |    1 +
 scripts/fill_help_tables.sql                       | 1014 ++---
 scripts/galera_new_cluster.sh                      |   14 +
 scripts/mariadb-service-convert                    |   82 +
 scripts/mysql_install_db.pl.in                     |    1 +
 scripts/mysql_install_db.sh                        |    6 +-
 scripts/mysql_secure_installation.sh               |   22 +-
 scripts/mysql_system_tables_fix.sql                |  389 +-
 scripts/mysqld_safe.sh                             |   25 +-
 scripts/wsrep_sst_common.sh                        |   32 +-
 scripts/wsrep_sst_mysqldump.sh                     |   10 +-
 scripts/wsrep_sst_rsync.sh                         |    2 +-
 scripts/wsrep_sst_xtrabackup-v2.sh                 |   17 +-
 scripts/wsrep_sst_xtrabackup.sh                    |   10 +-
 sql-common/client.c                                |    2 +-
 sql/CMakeLists.txt                                 |    6 +-
 sql/create_options.cc                              |    5 +-
 sql/debug_sync.cc                                  |    3 +-
 sql/derror.cc                                      |   30 +-
 sql/encryption.cc                                  |   70 +-
 sql/event_data_objects.cc                          |    2 +-
 sql/event_db_repository.cc                         |    5 +-
 sql/event_parse_data.cc                            |    4 +-
 sql/event_scheduler.cc                             |    2 +-
 sql/events.cc                                      |   35 +-
 sql/field.cc                                       | 1227 +++--
 sql/field.h                                        |  568 ++-
 sql/field_conv.cc                                  |   16 +-
 sql/filesort.cc                                    |   19 +-
 sql/gen_lex_token.cc                               |    6 +
 sql/group_by_handler.cc                            |  142 +
 sql/group_by_handler.h                             |  102 +
 sql/ha_partition.cc                                |   22 +-
 sql/handler.cc                                     |  170 +-
 sql/handler.h                                      |   24 +-
 sql/hostname.cc                                    |    2 +-
 sql/item.cc                                        | 1450 +++---
 sql/item.h                                         | 1015 +++--
 sql/item_cmpfunc.cc                                | 1263 +++---
 sql/item_cmpfunc.h                                 |  816 ++--
 sql/item_create.cc                                 |  530 +--
 sql/item_func.cc                                   |  759 ++--
 sql/item_func.h                                    |  680 +--
 sql/item_geofunc.cc                                |   85 +-
 sql/item_geofunc.h                                 |  120 +-
 sql/item_inetfunc.h                                |   37 +-
 sql/item_row.cc                                    |   13 +-
 sql/item_row.h                                     |   12 +-
 sql/item_strfunc.cc                                |  456 +-
 sql/item_strfunc.h                                 |  310 +-
 sql/item_subselect.cc                              |  434 +-
 sql/item_subselect.h                               |   31 +-
 sql/item_sum.cc                                    |  290 +-
 sql/item_sum.h                                     |  451 +-
 sql/item_timefunc.cc                               |   59 +-
 sql/item_timefunc.h                                |  169 +-
 sql/item_xmlfunc.cc                                |  370 +-
 sql/item_xmlfunc.h                                 |   21 +-
 sql/lock.cc                                        |    4 +-
 sql/log.cc                                         |  781 ++--
 sql/log.h                                          |   35 +-
 sql/log_event.cc                                   | 1703 +++----
 sql/log_event.h                                    |  706 +--
 sql/log_event_old.cc                               |   17 +-
 sql/log_event_old.h                                |   16 +-
 sql/log_slow.h                                     |   28 +-
 sql/mdl.cc                                         |   13 +-
 sql/mdl.h                                          |   13 +-
 sql/mf_iocache_encr.cc                             |   47 +-
 sql/my_decimal.cc                                  |   54 +-
 sql/my_decimal.h                                   |   16 +-
 sql/mysqld.cc                                      |  249 +-
 sql/mysqld.h                                       |   37 +-
 sql/net_serv.cc                                    |   17 +-
 sql/opt_index_cond_pushdown.cc                     |   42 +-
 sql/opt_range.cc                                   | 1726 ++-----
 sql/opt_range.h                                    |  623 ++-
 sql/opt_subselect.cc                               |  278 +-
 sql/opt_subselect.h                                |   26 +-
 sql/opt_sum.cc                                     |    9 +-
 sql/opt_table_elimination.cc                       |   42 +-
 sql/parse_file.cc                                  |    3 +-
 sql/partition_info.cc                              |  144 +-
 sql/partition_info.h                               |   12 +-
 sql/procedure.h                                    |   13 +-
 sql/protocol.cc                                    |    6 +-
 sql/protocol.h                                     |    9 +-
 sql/repl_failsafe.cc                               |   26 +-
 sql/rpl_constants.h                                |   40 +
 sql/rpl_gtid.cc                                    |    2 +-
 sql/rpl_handler.cc                                 |   54 +-
 sql/rpl_injector.cc                                |   56 -
 sql/rpl_injector.h                                 |   25 +-
 sql/rpl_mi.cc                                      |   28 +-
 sql/rpl_mi.h                                       |    2 +-
 sql/rpl_parallel.cc                                |   96 +-
 sql/rpl_record.cc                                  |   22 +-
 sql/rpl_rli.cc                                     |  109 +-
 sql/rpl_rli.h                                      |    2 +-
 sql/rpl_utility.cc                                 |   45 +-
 sql/set_var.cc                                     |   57 +-
 sql/set_var.h                                      |   34 +-
 sql/share/errmsg-utf8.txt                          |    7 +
 sql/signal_handler.cc                              |   41 +-
 sql/slave.cc                                       |  613 +--
 sql/slave.h                                        |    3 +-
 sql/sp.cc                                          |   39 +-
 sql/sp.h                                           |    2 +-
 sql/sp_head.cc                                     |   51 +-
 sql/sp_pcontext.cc                                 |    2 +-
 sql/sp_rcontext.cc                                 |   19 +-
 sql/sql_acl.cc                                     |  194 +-
 sql/sql_admin.cc                                   |   40 +-
 sql/sql_admin.h                                    |    2 +-
 sql/sql_alter.cc                                   |    4 +-
 sql/sql_analyse.cc                                 |   28 +-
 sql/sql_analyse.h                                  |    2 +-
 sql/sql_analyze_stmt.cc                            |   23 +-
 sql/sql_analyze_stmt.h                             |   30 +-
 sql/sql_array.h                                    |   10 +-
 sql/sql_base.cc                                    |  151 +-
 sql/sql_bitmap.h                                   |    2 +-
 sql/sql_cache.cc                                   |   46 +-
 sql/sql_cache.h                                    |   10 +-
 sql/sql_class.cc                                   |  365 +-
 sql/sql_class.h                                    |   93 +-
 sql/sql_connect.cc                                 |    2 +-
 sql/sql_const.h                                    |    6 +-
 sql/sql_cursor.cc                                  |   37 +
 sql/sql_db.cc                                      |   18 +-
 sql/sql_delete.cc                                  |    8 +-
 sql/sql_derived.cc                                 |    2 +-
 sql/sql_digest.cc                                  |   17 +-
 sql/sql_do.cc                                      |    2 +-
 sql/sql_error.cc                                   |   31 +-
 sql/sql_error.h                                    |   19 +-
 sql/sql_explain.cc                                 |  340 +-
 sql/sql_explain.h                                  |   35 +-
 sql/sql_expression_cache.cc                        |   18 +-
 sql/sql_expression_cache.h                         |   50 +-
 sql/sql_get_diagnostics.cc                         |    8 +-
 sql/sql_handler.cc                                 |   37 +-
 sql/sql_handler.h                                  |    5 +-
 sql/sql_help.cc                                    |   70 +-
 sql/sql_insert.cc                                  |  161 +-
 sql/sql_join_cache.cc                              |   11 +-
 sql/sql_lex.cc                                     |   29 +-
 sql/sql_lex.h                                      |   17 +-
 sql/sql_list.h                                     |    4 +-
 sql/sql_load.cc                                    |   69 +-
 sql/sql_locale.cc                                  |   11 +-
 sql/sql_parse.cc                                   |  347 +-
 sql/sql_parse.h                                    |    8 +-
 sql/sql_partition.cc                               |   28 +-
 sql/sql_partition.h                                |    2 +-
 sql/sql_partition_admin.cc                         |   23 +-
 sql/sql_plugin.cc                                  |   24 +-
 sql/sql_plugin_services.ic                         |    1 +
 sql/sql_prepare.cc                                 |   22 +-
 sql/sql_priv.h                                     |   17 +-
 sql/sql_profile.cc                                 |   35 +-
 sql/sql_reload.cc                                  |    2 +-
 sql/sql_rename.cc                                  |    2 +-
 sql/sql_repl.cc                                    |  537 ++-
 sql/sql_repl.h                                     |    3 +-
 sql/sql_select.cc                                  | 1404 +++---
 sql/sql_select.h                                   |   49 +-
 sql/sql_servers.cc                                 |    2 +-
 sql/sql_show.cc                                    |  450 +-
 sql/sql_show.h                                     |    2 +-
 sql/sql_signal.cc                                  |   12 +-
 sql/sql_string.cc                                  |   18 +-
 sql/sql_string.h                                   |   82 +-
 sql/sql_table.cc                                   |  233 +-
 sql/sql_table.h                                    |    2 +
 sql/sql_tablespace.cc                              |    4 +-
 sql/sql_test.cc                                    |    7 +-
 sql/sql_time.cc                                    |   68 +-
 sql/sql_time.h                                     |   76 +-
 sql/sql_trigger.cc                                 |   33 +-
 sql/sql_type.cc                                    |  152 +
 sql/sql_type.h                                     |  348 ++
 sql/sql_udf.cc                                     |   27 +-
 sql/sql_udf.h                                      |    2 +-
 sql/sql_union.cc                                   |   13 +-
 sql/sql_update.cc                                  |   39 +-
 sql/sql_view.cc                                    |   33 +-
 sql/sql_yacc.yy                                    | 1440 +++---
 sql/sys_vars.cc                                    |  153 +-
 sql/sys_vars.ic                                    |   45 +-
 sql/table.cc                                       |  161 +-
 sql/table.h                                        |    1 +
 sql/table_cache.h                                  |    4 +-
 sql/thr_malloc.cc                                  |    3 +-
 sql/threadpool_unix.cc                             |    2 +-
 sql/transaction.cc                                 |    2 +-
 sql/unireg.cc                                      |   30 +-
 sql/unireg.h                                       |   18 +-
 sql/wsrep_applier.cc                               |   53 +-
 sql/wsrep_applier.h                                |    3 +-
 sql/wsrep_binlog.cc                                |   33 +-
 sql/wsrep_dummy.cc                                 |    3 +
 sql/wsrep_hton.cc                                  |   36 +-
 sql/wsrep_mysqld.cc                                |  383 +-
 sql/wsrep_mysqld.h                                 |   23 +-
 sql/wsrep_priv.h                                   |   12 +-
 sql/wsrep_sst.cc                                   |  121 +-
 sql/wsrep_thd.cc                                   |   26 +-
 sql/wsrep_utils.cc                                 |  161 +-
 sql/wsrep_utils.h                                  |  144 +-
 sql/wsrep_var.cc                                   |   94 +-
 sql/wsrep_xid.cc                                   |  147 +
 sql/wsrep_xid.h                                    |   36 +
 storage/archive/archive_test.c                     |    2 +-
 storage/archive/ha_archive.cc                      |    2 +-
 storage/cassandra/ha_cassandra.cc                  |    2 +-
 storage/connect/CMakeLists.txt                     |    4 +-
 storage/connect/filamap.cpp                        |    2 +-
 storage/connect/filamzip.cpp                       |    2 +-
 storage/connect/ha_connect.cc                      |   56 +-
 storage/connect/jsonudf.cpp                        |    5 +-
 storage/connect/mycat.h                            |    1 +
 storage/connect/mysql-test/connect/r/endian.result |  105 +
 storage/connect/mysql-test/connect/r/grant.result  |   19 +-
 storage/connect/mysql-test/connect/r/grant2.result |  691 +++
 .../connect/mysql-test/connect/r/ini_grant.result  |    4 +-
 .../mysql-test/connect/r/mysql_grant.result        |    4 +-
 .../mysql-test/connect/r/mysql_index.result        |  114 +
 .../connect/mysql-test/connect/r/mysql_new.result  |    2 +-
 .../mysql-test/connect/r/odbc_sqlite3_grant.result |   16 +-
 .../connect/mysql-test/connect/r/xml_grant.result  |    3 +-
 storage/connect/mysql-test/connect/t/endian.test   |   88 +
 storage/connect/mysql-test/connect/t/grant.inc     |    3 +-
 storage/connect/mysql-test/connect/t/grant.test    |    5 +-
 storage/connect/mysql-test/connect/t/grant2.test   |  869 ++++
 .../connect/mysql-test/connect/t/ini_grant.test    |    4 +-
 .../connect/mysql-test/connect/t/mysql_grant.test  |    4 +-
 .../connect/mysql-test/connect/t/mysql_index.test  |   66 +
 .../connect/mysql-test/connect/t/mysql_new.test    |    2 +-
 .../mysql-test/connect/t/odbc_postgresql.test      |    9 +
 .../mysql-test/connect/t/odbc_sqlite3_grant.test   |   14 +-
 storage/connect/reldef.cpp                         |    2 +-
 storage/connect/tabmul.cpp                         |    2 +-
 storage/connect/tabmysql.cpp                       |   32 +-
 storage/connect/tabodbc.cpp                        |    7 +-
 storage/csv/ha_tina.cc                             |   42 +-
 storage/federated/ha_federated.h                   |    2 +-
 storage/federatedx/federatedx_io_mysql.cc          |    1 +
 storage/federatedx/ha_federatedx.cc                |    2 +-
 storage/innobase/CMakeLists.txt                    |   21 +-
 storage/innobase/api/api0api.cc                    |   12 +-
 storage/innobase/btr/btr0btr.cc                    |   79 +-
 storage/innobase/btr/btr0cur.cc                    |  163 +-
 storage/innobase/btr/btr0defragment.cc             |   25 +-
 storage/innobase/btr/btr0scrub.cc                  |   17 +-
 storage/innobase/buf/buf0buf.cc                    |  439 +-
 storage/innobase/buf/buf0dump.cc                   |    4 +-
 storage/innobase/buf/buf0flu.cc                    |   10 +-
 storage/innobase/buf/buf0rea.cc                    |   56 +-
 storage/innobase/dict/dict0crea.cc                 |  154 +-
 storage/innobase/dict/dict0dict.cc                 |  697 ++-
 storage/innobase/dict/dict0load.cc                 |    4 +-
 storage/innobase/dict/dict0mem.cc                  |    3 +-
 storage/innobase/dict/dict0stats.cc                |    5 +
 storage/innobase/fil/fil0crypt.cc                  |  218 +-
 storage/innobase/fil/fil0fil.cc                    |  224 +-
 storage/innobase/fil/fil0pagecompress.cc           |   80 +-
 storage/innobase/fsp/fsp0fsp.cc                    |   14 +
 storage/innobase/fts/fts0fts.cc                    |    2 +-
 storage/innobase/handler/ha_innodb.cc              |  472 +-
 storage/innobase/handler/ha_innodb.h               |   24 +-
 storage/innobase/handler/handler0alter.cc          |  229 +-
 storage/innobase/ibuf/ibuf0ibuf.cc                 |   24 +-
 storage/innobase/include/btr0btr.h                 |   25 +-
 storage/innobase/include/btr0btr.ic                |   22 +-
 storage/innobase/include/btr0cur.h                 |    4 +-
 storage/innobase/include/btr0defragment.h          |    5 +-
 storage/innobase/include/btr0pcur.h                |    4 +-
 storage/innobase/include/btr0pcur.ic               |   20 +-
 storage/innobase/include/buf0buf.h                 |   13 +-
 storage/innobase/include/buf0buf.ic                |    7 +-
 storage/innobase/include/buf0rea.h                 |    4 +-
 storage/innobase/include/db0err.h                  |    6 +
 storage/innobase/include/dict0crea.h               |   29 +-
 storage/innobase/include/dict0dict.h               |   74 +-
 storage/innobase/include/dict0dict.ic              |    4 +-
 storage/innobase/include/dict0mem.h                |    8 +-
 storage/innobase/include/fil0crypt.h               |   64 +-
 storage/innobase/include/fil0fil.h                 |   13 +-
 storage/innobase/include/fsp0pagecompress.ic       |   26 +-
 storage/innobase/include/fsp0types.h               |   18 +-
 storage/innobase/include/fts0fts.h                 |    2 +-
 storage/innobase/include/ha_prototypes.h           |   19 +-
 storage/innobase/include/ibuf0ibuf.ic              |    5 +-
 storage/innobase/include/log0crypt.h               |   70 +-
 storage/innobase/include/log0recv.h                |    2 +-
 storage/innobase/include/os0file.h                 |   18 +-
 storage/innobase/include/os0file.ic                |    6 +-
 storage/innobase/include/os0sync.h                 |  167 +-
 storage/innobase/include/page0cur.ic               |   17 +-
 storage/innobase/include/rem0rec.h                 |    2 +-
 storage/innobase/include/row0ftsort.h              |    6 +
 storage/innobase/include/row0merge.h               |   27 +-
 storage/innobase/include/row0mysql.h               |    5 +-
 storage/innobase/include/row0purge.h               |   12 +-
 storage/innobase/include/srv0mon.h                 |    2 +
 storage/innobase/include/srv0srv.h                 |    7 +-
 storage/innobase/include/sync0sync.h               |    9 +-
 storage/innobase/include/sync0sync.ic              |   19 +-
 storage/innobase/include/univ.i                    |    6 +-
 storage/innobase/lock/lock0lock.cc                 |   41 +-
 storage/innobase/log/log0crypt.cc                  |  154 +-
 storage/innobase/log/log0log.cc                    |    8 +-
 storage/innobase/log/log0recv.cc                   |  200 +-
 .../storage_engine/type_spatial_indexes.rdiff      |    4 +-
 storage/innobase/os/os0file.cc                     |   83 +-
 storage/innobase/page/page0zip.cc                  |   13 +-
 storage/innobase/pars/pars0pars.cc                 |    3 +-
 storage/innobase/row/row0ftsort.cc                 |   86 +-
 storage/innobase/row/row0import.cc                 |  121 +-
 storage/innobase/row/row0ins.cc                    |   34 +-
 storage/innobase/row/row0log.cc                    |    4 +-
 storage/innobase/row/row0merge.cc                  |  380 +-
 storage/innobase/row/row0mysql.cc                  |   52 +-
 storage/innobase/row/row0purge.cc                  |   79 +-
 storage/innobase/row/row0sel.cc                    |   43 +-
 storage/innobase/srv/srv0mon.cc                    |   10 +
 storage/innobase/srv/srv0srv.cc                    |   38 +-
 storage/innobase/srv/srv0start.cc                  |   24 +-
 storage/innobase/trx/trx0sys.cc                    |   22 +-
 storage/innobase/ut/ut0ut.cc                       |    2 +
 storage/maria/ha_maria.cc                          |    8 +-
 storage/maria/ma_blockrec.c                        |   13 +-
 storage/maria/ma_blockrec.h                        |    2 +-
 storage/maria/ma_check_standalone.h                |    2 +-
 storage/maria/ma_crypt.c                           |    4 +
 storage/maria/ma_dynrec.c                          |   21 +-
 storage/maria/ma_pagecache.c                       |   28 +-
 storage/maria/maria_pack.c                         |   10 +-
 storage/mroonga/CMakeLists.txt                     |   97 +-
 storage/mroonga/appveyor.yml                       |   10 +-
 storage/mroonga/build/makefiles/gettext.am         |   21 +-
 storage/mroonga/build/makefiles/sphinx.am          |    2 +-
 storage/mroonga/configure.ac                       |   24 +-
 storage/mroonga/ha_mroonga.cpp                     | 1767 +++++---
 storage/mroonga/ha_mroonga.hpp                     |  102 +-
 storage/mroonga/lib/mrn_condition_converter.cpp    |    4 -
 storage/mroonga/lib/mrn_condition_converter.hpp    |    3 +-
 storage/mroonga/lib/mrn_database_manager.cpp       |   15 +-
 storage/mroonga/lib/mrn_database_repairer.cpp      |    2 +-
 storage/mroonga/lib/mrn_encoding.cpp               |    1 -
 storage/mroonga/lib/mrn_encoding.hpp               |    6 +-
 storage/mroonga/lib/mrn_field_normalizer.cpp       |    2 -
 storage/mroonga/lib/mrn_field_normalizer.hpp       |    6 +-
 storage/mroonga/lib/mrn_index_table_name.cpp       |   31 +-
 storage/mroonga/lib/mrn_index_table_name.hpp       |    7 +
 storage/mroonga/lib/mrn_lock.cpp                   |   15 +-
 storage/mroonga/lib/mrn_lock.hpp                   |    5 +-
 .../mroonga/lib/mrn_multiple_column_key_codec.cpp  |  311 +-
 .../mroonga/lib/mrn_multiple_column_key_codec.hpp  |   46 +-
 storage/mroonga/lib/mrn_mysqlservices.cpp          |    4 -
 storage/mroonga/lib/mrn_smart_grn_obj.cpp          |    6 +
 storage/mroonga/lib/mrn_smart_grn_obj.hpp          |    1 +
 storage/mroonga/lib/mrn_time_converter.cpp         |   45 +-
 storage/mroonga/lib/mrn_time_converter.hpp         |    8 +-
 storage/mroonga/lib/mrn_value_decoder.cpp          |   11 +
 storage/mroonga/lib/mrn_value_decoder.hpp          |    1 +
 storage/mroonga/mrn_constants.hpp                  |    4 +-
 storage/mroonga/mrn_err.h                          |    6 +-
 storage/mroonga/mrn_mysql_compat.h                 |   67 +-
 storage/mroonga/mrn_table.cpp                      |  104 +-
 storage/mroonga/mrn_table.hpp                      |   18 +-
 .../include/mroonga/check_libgroonga_embedded.inc  |   19 +
 .../mroonga/have_fulltext_index_comment.inc        |   25 -
 .../mroonga/have_groonga_plugin_register.inc       |   22 +
 .../mroonga/include/mroonga/have_mariadb.inc       |   21 +
 .../mroonga/include/mroonga/have_mroonga.inc       |    3 +
 .../r/alter_table_add_column_flags_comment.result  |   10 +
 .../alter_table_add_column_flags_parameter.result  |   17 +
 ...er_table_add_column_groonga_type_comment.result |   18 +
 ..._table_add_column_groonga_type_parameter.result |   26 +
 .../r/alter_table_add_column_type_comment.result   |   18 +
 .../r/alter_table_add_column_with_flags.result     |   10 -
 .../r/alter_table_add_column_with_type.result      |   18 -
 ...add_index_token_filters_one_token_filter.result |    4 +-
 ...lter_table_change_column_rename_multiple.result |    4 +-
 .../r/alter_table_change_token_filter.result       |    4 +-
 .../r/column_datetime_zero_date_strict.result      |   23 +
 .../r/create_table_field_flags_comment.result      |   10 +
 .../r/create_table_field_flags_parameter.result    |   17 +
 .../create_table_field_groonga_type_comment.result |   18 +
 ...ate_table_field_groonga_type_nonexistent.result |    6 +
 ...reate_table_field_groonga_type_parameter.result |   26 +
 .../r/create_table_field_type_comment.result       |   18 +
 .../r/create_table_field_type_nonexistent.result   |    6 +
 .../r/create_table_index_flags_comment.result      |    9 +
 .../storage/r/create_table_index_flags_none.result |    2 +-
 .../r/create_table_index_flags_parameter.result    |   15 +
 ...ndex_flags_with_position_and_with_weight.result |    9 -
 .../r/create_table_index_index_flags_none.result   |    9 +
 ...ndex_flags_with_position_and_with_weight.result |    9 +
 .../r/create_table_index_normalizer_comment.result |   16 +
 ...zer_no_utf8_charset_with_utf8_normalizer.result |   12 +
 .../r/create_table_index_normalizer_none.result    |   16 +
 .../create_table_index_normalizer_parameter.result |   21 +
 .../r/create_table_index_parser_comment.result     |   31 +
 .../r/create_table_index_parser_default.result     |   33 +
 .../storage/r/create_table_index_parser_off.result |   42 +
 ...dex_token_filters_multiple_token_filters.result |   17 +
 ...ble_index_token_filters_one_token_filter.result |   17 +
 ...eate_table_index_token_filters_parameter.result |   23 +
 .../r/create_table_index_tokenizer_comment.result  |   31 +
 .../r/create_table_index_tokenizer_default.result  |   33 +
 .../r/create_table_index_tokenizer_off.result      |   42 +
 .../create_table_index_tokenizer_parameter.result  |   30 +
 ..._table_normalizer_fulltext_index_comment.result |   16 -
 ...dex_no_utf8_charset_with_utf8_normalizer.result |   12 -
 ...ate_table_normalizer_fulltext_index_none.result |   16 -
 ...ble_normalizer_primary_key_table_comment.result |   18 -
 ...rimary_key_table_comment_with_using_hash.result |   19 -
 .../storage/r/create_table_reference_type.result   |   18 -
 .../r/create_table_table_normalizer_default.result |   18 +
 .../r/create_table_table_normalizer_hash.result    |   19 +
 ...ble_token_filters_multiple_token_filters.result |   25 +
 ...ble_table_token_filters_one_token_filter.result |   25 +
 ...eate_table_table_token_filters_stop_word.result |   23 +
 ...ers_index_comment_multiple_token_filters.result |   17 -
 ...n_filters_index_comment_one_token_filter.result |   17 -
 ...ers_table_comment_multiple_token_filters.result |   25 -
 ...n_filters_table_comment_one_token_filter.result |   25 -
 .../mroonga/storage/r/create_table_vector.result   |   10 -
 ...e_pragma_default_operator_or_no_operator.result |    5 +-
 ...de_pragma_default_operator_or_with_minus.result |    5 +-
 ...ode_pragma_default_operator_or_with_plus.result |    5 +-
 ...agma_default_operator_plus_with_astarisk.result |   14 +
 .../storage/r/fulltext_not_match_against.result    |   20 +-
 .../storage/r/fulltext_parser_comment.result       |   29 -
 .../storage/r/fulltext_parser_default.result       |   33 -
 .../mroonga/storage/r/fulltext_parser_off.result   |   42 -
 .../storage/r/fulltext_token_filters_skip.result   |   23 -
 ...etime_insert_delete_insert_invalid_value.result |   21 +
 .../storage/r/replace_select_varchar.result        |    3 +-
 .../mroonga/storage/r/replace_without_key.result   |    2 +-
 .../mysql-test/mroonga/storage/r/truncate.result   |   13 +-
 .../mroonga/mysql-test/mroonga/storage/suite.pm    |    7 +-
 .../t/alter_table_add_column_flags_comment.test    |   38 +
 .../t/alter_table_add_column_flags_parameter.test  |   41 +
 ...lter_table_add_column_groonga_type_comment.test |   44 +
 ...er_table_add_column_groonga_type_parameter.test |   47 +
 .../t/alter_table_add_column_type_comment.test     |   43 +
 .../t/alter_table_add_column_with_flags.test       |   38 -
 .../t/alter_table_add_column_with_type.test        |   43 -
 ...e_add_index_token_filters_one_token_filter.test |    3 +-
 .../storage/t/alter_table_change_token_filter.test |    3 +-
 .../t/column_datetime_zero_date_strict.test        |   41 +
 .../t/create_table_field_flags_comment.test        |   37 +
 .../t/create_table_field_flags_parameter.test      |   39 +
 .../t/create_table_field_groonga_type_comment.test |   42 +
 ...reate_table_field_groonga_type_nonexistent.test |   29 +
 .../create_table_field_groonga_type_parameter.test |   45 +
 .../storage/t/create_table_field_type_comment.test |   42 +
 .../t/create_table_field_type_nonexistent.test     |   29 +
 .../t/create_table_index_flags_comment.test        |   39 +
 .../storage/t/create_table_index_flags_none.test   |    3 +-
 .../t/create_table_index_flags_parameter.test      |   41 +
 ..._index_flags_with_position_and_with_weight.test |   38 -
 .../t/create_table_index_index_flags_none.test     |   38 +
 ..._index_flags_with_position_and_with_weight.test |   38 +
 .../t/create_table_index_normalizer_comment.test   |   42 +
 ...lizer_no_utf8_charset_with_utf8_normalizer.test |   40 +
 .../t/create_table_index_normalizer_none.test      |   42 +
 .../t/create_table_index_normalizer_parameter.test |   40 +
 .../t/create_table_index_parser_comment.test       |   42 +
 .../t/create_table_index_parser_default.test       |   41 +
 .../storage/t/create_table_index_parser_off.test   |   47 +
 ...index_token_filters_multiple_token_filters.test |   41 +
 ...table_index_token_filters_one_token_filter.test |   41 +
 ...create_table_index_token_filters_parameter.test |   44 +
 .../t/create_table_index_tokenizer_comment.test    |   42 +
 .../t/create_table_index_tokenizer_default.test    |   41 +
 .../t/create_table_index_tokenizer_off.test        |   47 +
 .../t/create_table_index_tokenizer_parameter.test  |   42 +
 ...te_table_normalizer_fulltext_index_comment.test |   42 -
 ...index_no_utf8_charset_with_utf8_normalizer.test |   40 -
 ...reate_table_normalizer_fulltext_index_none.test |   42 -
 ...table_normalizer_primary_key_table_comment.test |   46 -
 ..._primary_key_table_comment_with_using_hash.test |   47 -
 .../storage/t/create_table_reference_type.test     |   42 -
 .../t/create_table_table_normalizer_default.test   |   46 +
 .../t/create_table_table_normalizer_hash.test      |   47 +
 ...table_token_filters_multiple_token_filters.test |   46 +
 ...table_table_token_filters_one_token_filter.test |   46 +
 ...create_table_table_token_filters_stop_word.test |   53 +
 ...lters_index_comment_multiple_token_filters.test |   40 -
 ...ken_filters_index_comment_one_token_filter.test |   40 -
 ...lters_table_comment_multiple_token_filters.test |   45 -
 ...ken_filters_table_comment_one_token_filter.test |   45 -
 .../mroonga/storage/t/create_table_vector.test     |   37 -
 ...ode_pragma_default_operator_or_no_operator.test |    5 +-
 ...mode_pragma_default_operator_or_with_minus.test |    5 +-
 ..._mode_pragma_default_operator_or_with_plus.test |    5 +-
 ...pragma_default_operator_plus_with_astarisk.test |   38 +
 .../storage/t/fulltext_not_match_against.test      |   21 +-
 .../mroonga/storage/t/fulltext_parser_comment.test |   38 -
 .../mroonga/storage/t/fulltext_parser_default.test |   41 -
 .../mroonga/storage/t/fulltext_parser_off.test     |   48 -
 .../storage/t/fulltext_token_filters_skip.test     |   52 -
 ...atetime_insert_delete_insert_invalid_value.test |   39 +
 .../mroonga/storage/t/replace_select_varchar.test  |    3 +-
 .../mroonga/storage/t/replace_without_key.test     |    2 +-
 .../mysql-test/mroonga/storage/t/truncate.test     |   14 +-
 ...variable_match_escalation_threshold_global.test |    1 -
 ...ariable_match_escalation_threshold_session.test |    1 -
 .../wrapper/r/create_table_flags_comment.result    |    9 +
 .../wrapper/r/create_table_flags_none.result       |    9 +
 .../wrapper/r/create_table_flags_parameter.result  |   16 +
 .../r/create_table_normalizer_comment.result       |   21 +
 .../create_table_normalizer_fulltext_index.result  |   16 -
 .../r/create_table_normalizer_parameter.result     |   21 +
 .../wrapper/r/create_table_parser_comment.result   |   29 +
 ...ers_index_comment_multiple_token_filters.result |   17 -
 ...n_filters_index_comment_one_token_filter.result |   17 -
 ...ken_filters_index_multiple_token_filters.result |   17 +
 ...ble_token_filters_index_one_token_filter.result |   17 +
 ...eate_table_token_filters_index_parameter.result |   25 +
 .../r/create_table_tokenizer_comment.result        |   29 +
 .../r/create_table_tokenizer_parameter.result      |   30 +
 ...e_pragma_default_operator_or_no_operator.result |    5 +-
 ...de_pragma_default_operator_or_with_minus.result |    3 +-
 ...ode_pragma_default_operator_or_with_plus.result |    3 +-
 .../wrapper/r/fulltext_insert_select.result        |    4 +-
 .../mroonga/wrapper/r/fulltext_many_records.result |    2 +-
 ...and_not_matched_have_where_matched_order.result |   26 +
 ...ched_and_not_matched_have_where_no_order.result |   24 +
 ...ched_and_not_matched_no_where_both_order.result |   26 +
 .../mroonga/wrapper/r/fulltext_myisam.result       |   18 +-
 .../wrapper/r/fulltext_not_match_against.result    |   20 +-
 .../wrapper/r/fulltext_order_TODO_SPLIT_ME.result  |   18 +-
 .../wrapper/r/fulltext_parser_comment.result       |   29 -
 .../mysql-test/mroonga/wrapper/r/truncate.result   |   13 +-
 .../mroonga/mysql-test/mroonga/wrapper/suite.pm    |    7 +-
 .../mroonga/wrapper/t/count_star_with_index.test   |    1 -
 .../wrapper/t/create_table_flags_comment.test      |   40 +
 .../mroonga/wrapper/t/create_table_flags_none.test |   40 +
 .../wrapper/t/create_table_flags_parameter.test    |   42 +
 .../wrapper/t/create_table_normalizer_comment.test |   40 +
 .../t/create_table_normalizer_fulltext_index.test  |   43 -
 .../t/create_table_normalizer_parameter.test       |   41 +
 .../wrapper/t/create_table_parser_comment.test     |   38 +
 ...lters_index_comment_multiple_token_filters.test |   42 -
 ...ken_filters_index_comment_one_token_filter.test |   42 -
 ...token_filters_index_multiple_token_filters.test |   43 +
 ...table_token_filters_index_one_token_filter.test |   43 +
 ...create_table_token_filters_index_parameter.test |   46 +
 .../wrapper/t/create_table_tokenizer_comment.test  |   38 +
 .../t/create_table_tokenizer_parameter.test        |   43 +
 ...ode_pragma_default_operator_or_no_operator.test |    5 +-
 ...mode_pragma_default_operator_or_with_minus.test |    5 +-
 ..._mode_pragma_default_operator_or_with_plus.test |    5 +-
 .../mroonga/wrapper/t/fulltext_insert_select.test  |    2 +-
 .../mroonga/wrapper/t/fulltext_many_records.test   |    4 +-
 ...d_and_not_matched_have_where_matched_order.test |   50 +
 ...atched_and_not_matched_have_where_no_order.test |   48 +
 ...atched_and_not_matched_no_where_both_order.test |   50 +
 .../mroonga/wrapper/t/fulltext_myisam.test         |   16 +-
 .../wrapper/t/fulltext_not_match_against.test      |   22 +-
 .../wrapper/t/fulltext_order_TODO_SPLIT_ME.test    |    4 -
 .../mroonga/wrapper/t/fulltext_parser_comment.test |   39 -
 .../wrapper/t/performance_schema-master.opt        |    2 +-
 .../mysql-test/mroonga/wrapper/t/truncate.test     |   14 +-
 ...variable_match_escalation_threshold_global.test |    1 -
 ...ariable_match_escalation_threshold_session.test |    1 -
 storage/mroonga/packages/apt/build-deb.sh          |    6 +-
 storage/mroonga/packages/debian/changelog          |   12 +
 .../packages/rpm/centos/mariadb-mroonga.spec.in    |    6 +
 .../packages/rpm/centos/mysql55-mroonga.spec.in    |    6 +
 .../rpm/centos/mysql56-community-mroonga.spec.in   |   44 +-
 .../rpm/centos/percona-server-56-mroonga.spec.in   |   26 +-
 storage/mroonga/packages/source/Makefile.am        |    6 +-
 storage/mroonga/packages/ubuntu/upload.rb          |    4 +-
 storage/mroonga/packages/yum/sign-rpm.sh           |    2 +-
 storage/mroonga/plugin_version                     |    2 +-
 storage/mroonga/tools/travis/before_script.sh      |   29 +-
 storage/mroonga/tools/travis/script.sh             |   14 +-
 storage/mroonga/vendor/groonga/CMakeLists.txt      |   91 +-
 storage/mroonga/vendor/groonga/base_version        |    2 +-
 .../mroonga/vendor/groonga/bindings/php/groonga.c  |    3 +
 .../groonga/build/ac_macros/check_headers.m4       |    5 -
 storage/mroonga/vendor/groonga/config.h.cmake      |    7 +-
 storage/mroonga/vendor/groonga/configure.ac        |    4 +-
 .../groonga/examples/dictionary/edict/edict2grn.rb |   56 +-
 .../groonga/examples/dictionary/gene95/gene2grn.rb |   63 +-
 .../vendor/groonga/groonga-httpd-conf.sh.in        |    2 +
 .../vendor/groonga/include/groonga/command.h       |    2 +
 .../vendor/groonga/include/groonga/groonga.h       |    2 +
 .../vendor/groonga/include/groonga/plugin.h        |    5 +
 storage/mroonga/vendor/groonga/lib/CMakeLists.txt  |    9 +-
 storage/mroonga/vendor/groonga/lib/com.c           |   27 +-
 storage/mroonga/vendor/groonga/lib/command.c       |    8 +
 storage/mroonga/vendor/groonga/lib/ctx.c           |   57 +-
 storage/mroonga/vendor/groonga/lib/ctx_impl_mrb.c  |   36 +-
 storage/mroonga/vendor/groonga/lib/dat.cpp         |   32 +-
 .../mroonga/vendor/groonga/lib/dat/file-impl.cpp   |   20 +-
 .../mroonga/vendor/groonga/lib/dat/file-impl.hpp   |    4 +-
 storage/mroonga/vendor/groonga/lib/dat/file.cpp    |    8 +-
 storage/mroonga/vendor/groonga/lib/dat/file.hpp    |    4 +-
 storage/mroonga/vendor/groonga/lib/dat/trie.cpp    |    6 +-
 storage/mroonga/vendor/groonga/lib/dat/trie.hpp    |    4 +-
 storage/mroonga/vendor/groonga/lib/db.c            |  439 +-
 storage/mroonga/vendor/groonga/lib/egn.cpp         | 3245 ++++++++++++++
 storage/mroonga/vendor/groonga/lib/error.c         |   14 +
 storage/mroonga/vendor/groonga/lib/expr.c          |  284 +-
 storage/mroonga/vendor/groonga/lib/expr_code.c     |   71 +
 storage/mroonga/vendor/groonga/lib/grn.h           |    8 +-
 storage/mroonga/vendor/groonga/lib/grn_ctx.h       |    5 +-
 .../mroonga/vendor/groonga/lib/grn_ctx_impl_mrb.h  |    3 +-
 storage/mroonga/vendor/groonga/lib/grn_dat.h       |    4 +-
 storage/mroonga/vendor/groonga/lib/grn_db.h        |    2 +
 storage/mroonga/vendor/groonga/lib/grn_egn.h       |   90 +
 storage/mroonga/vendor/groonga/lib/grn_egn.hpp     |  318 ++
 storage/mroonga/vendor/groonga/lib/grn_error.h     |    1 +
 storage/mroonga/vendor/groonga/lib/grn_expr_code.h |   37 +
 storage/mroonga/vendor/groonga/lib/grn_ii.h        |    5 +-
 storage/mroonga/vendor/groonga/lib/grn_io.h        |    5 +-
 storage/mroonga/vendor/groonga/lib/grn_mrb.h       |    2 +
 storage/mroonga/vendor/groonga/lib/grn_plugin.h    |    1 +
 storage/mroonga/vendor/groonga/lib/grn_proc.h      |    4 +-
 storage/mroonga/vendor/groonga/lib/ii.c            |  152 +-
 storage/mroonga/vendor/groonga/lib/io.c            |  197 +-
 storage/mroonga/vendor/groonga/lib/logger.c        |    4 +-
 storage/mroonga/vendor/groonga/lib/mrb.c           |   21 +-
 storage/mroonga/vendor/groonga/lib/mrb/mrb_array.c |   32 +
 storage/mroonga/vendor/groonga/lib/mrb/mrb_bulk.c  |   51 +-
 .../mroonga/vendor/groonga/lib/mrb/mrb_column.c    |   19 +
 .../vendor/groonga/lib/mrb/mrb_command_input.c     |   17 +
 .../mroonga/vendor/groonga/lib/mrb/mrb_converter.c |    2 +-
 .../vendor/groonga/lib/mrb/mrb_index_column.c      |   21 +-
 .../mroonga/vendor/groonga/lib/mrb/mrb_object.c    |   23 +-
 .../mroonga/vendor/groonga/lib/mrb/mrb_object.h    |    2 +
 storage/mroonga/vendor/groonga/lib/mrb/mrb_table.c |  202 +-
 .../vendor/groonga/lib/mrb/mrb_table_group_flags.c |   48 +
 .../vendor/groonga/lib/mrb/mrb_table_group_flags.h |   34 +
 .../groonga/lib/mrb/mrb_table_group_result.c       |  250 ++
 .../groonga/lib/mrb/mrb_table_group_result.h       |   34 +
 .../vendor/groonga/lib/mrb/mrb_table_sort_flags.c  |   42 +
 .../vendor/groonga/lib/mrb/mrb_table_sort_flags.h  |   34 +
 .../vendor/groonga/lib/mrb/mrb_table_sort_key.c    |  157 +
 .../vendor/groonga/lib/mrb/mrb_table_sort_key.h    |   34 +
 .../lib/mrb/scripts/expression_size_estimator.rb   |    7 +-
 .../groonga/lib/mrb/scripts/initialize/post.rb     |    1 +
 .../vendor/groonga/lib/mrb/scripts/sources.am      |    1 +
 .../vendor/groonga/lib/mrb/scripts/table.rb        |   90 +
 storage/mroonga/vendor/groonga/lib/mrb/sources.am  |    8 +
 storage/mroonga/vendor/groonga/lib/operator.c      |   68 +-
 storage/mroonga/vendor/groonga/lib/output.c        |   70 +-
 storage/mroonga/vendor/groonga/lib/plugin.c        |   19 +-
 storage/mroonga/vendor/groonga/lib/proc.c          |  160 +-
 storage/mroonga/vendor/groonga/lib/sources.am      |    5 +
 storage/mroonga/vendor/groonga/lib/store.c         |    7 +-
 storage/mroonga/vendor/groonga/lib/token_cursor.c  |    2 +-
 storage/mroonga/vendor/groonga/lib/tokenizers.c    |  203 +-
 .../mroonga/vendor/groonga/plugins/CMakeLists.txt  |   10 +-
 .../groonga/plugins/functions/CMakeLists.txt       |   18 +-
 .../vendor/groonga/plugins/functions/vector.c      |    4 +
 .../groonga/plugins/query_expanders/CMakeLists.txt |   18 +-
 .../vendor/groonga/plugins/query_expanders/tsv.c   |    4 +
 .../vendor/groonga/plugins/ruby/CMakeLists.txt     |   36 +-
 storage/mroonga/vendor/groonga/plugins/ruby/eval.c |    4 +
 storage/mroonga/vendor/groonga/plugins/ruby/load.c |    4 +
 storage/mroonga/vendor/groonga/plugins/sharding.rb |    2 +
 .../vendor/groonga/plugins/sharding/CMakeLists.txt |   12 +-
 .../groonga/plugins/sharding/logical_enumerator.rb |  156 +-
 .../groonga/plugins/sharding/logical_select.rb     |  332 ++
 .../plugins/sharding/logical_table_remove.rb       |   70 +
 .../vendor/groonga/plugins/sharding/sources.am     |    2 +
 .../vendor/groonga/plugins/suggest/CMakeLists.txt  |   14 +-
 .../vendor/groonga/plugins/suggest/suggest.c       |    4 +
 .../vendor/groonga/plugins/table/CMakeLists.txt    |   16 +-
 .../groonga/plugins/token_filters/CMakeLists.txt   |   36 +-
 .../vendor/groonga/plugins/token_filters/stem.c    |    4 +
 .../groonga/plugins/token_filters/stop_word.c      |    4 +
 .../groonga/plugins/tokenizers/CMakeLists.txt      |   36 +-
 .../vendor/groonga/plugins/tokenizers/kytea.cpp    |    4 +
 .../vendor/groonga/plugins/tokenizers/mecab.c      |   20 +-
 storage/mroonga/vendor/groonga/ra.rb               |   12 +
 storage/mroonga/vendor/groonga/src/grndb.c         |    2 +
 storage/mroonga/vendor/groonga/src/grnslap.c       |   10 +-
 storage/mroonga/vendor/groonga/src/groonga.c       |   13 +-
 .../mroonga/vendor/groonga/src/groonga_benchmark.c |   12 +-
 storage/mroonga/vendor/groonga/src/groonga_mruby.c |    2 +
 .../vendor/groonga/src/httpd/nginx-module/config   |    8 +-
 .../httpd/nginx-module/ngx_http_groonga_module.c   |   32 +-
 .../tools/install/install-for-debian-jessie.sh     |   17 +
 .../vendor/groonga/vendor/mruby/CMakeLists.txt     |    1 +
 .../vendor/groonga/vendor/mruby/Makefile.am        |   11 +-
 .../vendor/groonga/vendor/mruby/build_config.rb    |    1 +
 .../vendor/groonga/vendor/mruby/built_sources.am   |    2 +-
 .../vendor/groonga/vendor/mruby/mruby_build.rb     |    6 +-
 .../mroonga/vendor/groonga/vendor/mruby/sources.am |    6 +-
 .../vendor/groonga/vendor/onigmo/CMakeLists.txt    |   13 +
 .../vendor/groonga/vendor/onigmo/Makefile.am       |    1 +
 .../vendor/groonga/vendor/onigmo/config.h.cmake    |    1 +
 .../groonga-normalizer-mysql/doc/text/news.md      |   11 +
 .../normalizers/CMakeLists.txt                     |   14 +-
 .../groonga-normalizer-mysql/normalizers/mysql.c   |   53 +-
 .../packages/apt/build-deb.sh                      |    6 +-
 .../packages/debian/changelog                      |    6 +
 .../rpm/centos/groonga-normalizer-mysql.spec.in    |    3 +
 .../rpm/fedora/groonga-normalizer-mysql.spec.in    |    3 +
 .../plugins/groonga-normalizer-mysql/version       |    2 +-
 storage/mroonga/version                            |    2 +-
 storage/mroonga/version_in_hex                     |    2 +-
 storage/mroonga/version_micro                      |    2 +-
 storage/myisam/ha_myisam.cc                        |   57 +-
 storage/myisam/myisamdef.h                         |    4 +-
 .../mysql-test/storage_engine/foreign_keys.rdiff   |    2 +-
 storage/myisammrg/ha_myisammrg.cc                  |    2 +-
 .../mysql-test/storage_engine/foreign_keys.rdiff   |    2 +-
 .../mysql-test/storage_engine/type_spatial.rdiff   |    4 +-
 .../storage_engine/type_spatial_indexes.rdiff      |    8 +-
 storage/oqgraph/CMakeLists.txt                     |   19 +-
 storage/perfschema/ha_perfschema.cc                |    2 +-
 storage/perfschema/pfs.cc                          |    1 +
 storage/perfschema/pfs_account.cc                  |    4 +-
 storage/perfschema/pfs_con_slice.cc                |   11 +-
 storage/perfschema/pfs_digest.cc                   |   17 +-
 storage/perfschema/pfs_digest.h                    |    2 +-
 storage/perfschema/pfs_events_stages.cc            |    6 +-
 storage/perfschema/pfs_events_statements.cc        |   16 +-
 storage/perfschema/pfs_events_statements.h         |    4 +-
 storage/perfschema/pfs_events_waits.cc             |    6 +-
 storage/perfschema/pfs_global.cc                   |   38 +-
 storage/perfschema/pfs_global.h                    |   18 +-
 storage/perfschema/pfs_host.cc                     |    2 +-
 storage/perfschema/pfs_instr.cc                    |   40 +-
 storage/perfschema/pfs_instr.h                     |    2 +-
 storage/perfschema/pfs_instr_class.cc              |   38 +-
 storage/perfschema/pfs_server.h                    |    2 +-
 storage/perfschema/pfs_setup_actor.cc              |    6 +-
 storage/perfschema/pfs_setup_object.cc             |    6 +-
 storage/perfschema/pfs_timer.cc                    |   40 +-
 storage/perfschema/pfs_user.cc                     |    2 +-
 storage/perfschema/table_events_stages.cc          |   14 +-
 storage/perfschema/table_events_statements.cc      |   24 +-
 storage/perfschema/table_events_waits.cc           |   17 +-
 storage/perfschema/table_helper.cc                 |    2 +-
 storage/perfschema/unittest/CMakeLists.txt         |    2 +-
 storage/perfschema/unittest/pfs_misc-t.cc          |   72 +
 storage/perfschema/unittest/pfs_server_stubs.cc    |    6 +-
 storage/perfschema/unittest/stub_pfs_global.h      |   24 +-
 storage/perfschema/unittest/stub_print_error.h     |   19 +-
 .../sequence/mysql-test/sequence/group_by.result   |   88 +
 storage/sequence/mysql-test/sequence/group_by.test |   42 +
 storage/sequence/sequence.cc                       |  135 +-
 storage/sphinx/ha_sphinx.cc                        |   11 +-
 storage/spider/CMakeLists.txt                      |    5 +-
 storage/spider/spd_db_mysql.cc                     |    2 +-
 storage/spider/spd_param.cc                        |    2 +-
 storage/spider/spd_sys_table.cc                    |   12 +-
 .../mysql-test/sql_discovery/simple.result         |    2 +-
 .../mysql-test/sql_discovery/simple.test           |    2 +-
 storage/tokudb/CMakeLists.txt                      |   39 +-
 .../ft-index/cmake_modules/TokuSetupCompiler.cmake |   73 +-
 storage/tokudb/ha_tokudb.cc                        |    2 +
 .../tokudb/r/cluster_create_table.result           |   12 +-
 .../tokudb/r/cluster_filter_hidden.result          |   32 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-10.result  |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-21.result  |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-22.result  |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-23.result  |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-25.result  |    4 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-3.result   |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-33.result  |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-34.result  |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-35.result  |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-36.result  |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-37.result  |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-38.result  |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-4.result   |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-5.result   |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-6.result   |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-7.result   |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-8.result   |    2 +-
 storage/tokudb/mysql-test/tokudb/r/mvcc-9.result   |    2 +-
 .../tokudb/r/rows-32m-rand-insert.result           |    1 +
 .../mysql-test/tokudb/r/rows-32m-seq-insert.result |    1 +
 .../tokudb/mysql-test/tokudb/r/type_blob.result    |    6 +-
 .../mysql-test/tokudb/r/type_datetime.result       |    2 +-
 .../tokudb/mysql-test/tokudb/r/type_decimal.result |    9 +-
 .../tokudb/mysql-test/tokudb/r/type_float.result   |    8 +-
 .../mysql-test/tokudb/r/type_newdecimal.result     |   60 +-
 .../mysql-test/tokudb/r/type_timestamp.result      |   18 +-
 .../tokudb/mysql-test/tokudb/r/type_varchar.result |    2 +
 .../mysql-test/tokudb/t/cluster_filter_hidden.test |   34 +-
 .../tokudb/mysql-test/tokudb/t/type_datetime.test  |    2 +-
 .../tokudb/mysql-test/tokudb/t/type_timestamp.test |   18 +-
 .../mysql-test/tokudb_alter_table/r/ai_part.result |    4 +-
 .../tokudb_alter_table/r/hcad_part.result          |    4 +-
 .../mysql-test/tokudb_alter_table/r/hcr3.result    |    6 +-
 .../tokudb_alter_table/r/other_alter.result        |    2 +-
 .../tokudb_alter_table/r/other_alter2.result       |    4 +-
 .../mysql-test/tokudb_bugs/r/dict_leak_3518.result |    8 +-
 .../mysql-test/tokudb_bugs/r/frm_store3.result     |    2 +-
 storage/xtradb/CMakeLists.txt                      |    8 -
 storage/xtradb/api/api0api.cc                      |   27 +-
 storage/xtradb/btr/btr0btr.cc                      |   80 +-
 storage/xtradb/btr/btr0cur.cc                      |  135 +-
 storage/xtradb/btr/btr0defragment.cc               |   25 +-
 storage/xtradb/btr/btr0scrub.cc                    |   17 +-
 storage/xtradb/buf/buf0buf.cc                      |  676 ++-
 storage/xtradb/buf/buf0checksum.cc                 |   21 +-
 storage/xtradb/buf/buf0dump.cc                     |    4 +-
 storage/xtradb/buf/buf0flu.cc                      |   23 +-
 storage/xtradb/buf/buf0rea.cc                      |   35 +-
 storage/xtradb/dict/dict0crea.cc                   |  153 +-
 storage/xtradb/dict/dict0dict.cc                   |  633 ++-
 storage/xtradb/dict/dict0load.cc                   |    4 +-
 storage/xtradb/dict/dict0mem.cc                    |    3 +-
 storage/xtradb/dict/dict0stats.cc                  |    5 +
 storage/xtradb/dict/dict0stats_bg.cc               |    8 +
 storage/xtradb/fil/fil0crypt.cc                    |  213 +-
 storage/xtradb/fil/fil0fil.cc                      |  222 +-
 storage/xtradb/fil/fil0pagecompress.cc             |   84 +-
 storage/xtradb/fsp/fsp0fsp.cc                      |   16 +-
 storage/xtradb/fts/fts0fts.cc                      |    2 +-
 storage/xtradb/handler/ha_innodb.cc                |  537 ++-
 storage/xtradb/handler/ha_innodb.h                 |   24 +-
 storage/xtradb/handler/handler0alter.cc            |  225 +-
 storage/xtradb/ibuf/ibuf0ibuf.cc                   |   28 +-
 storage/xtradb/include/api0api.h                   |   10 +-
 storage/xtradb/include/btr0btr.h                   |   25 +-
 storage/xtradb/include/btr0btr.ic                  |   22 +-
 storage/xtradb/include/btr0cur.h                   |    4 +-
 storage/xtradb/include/btr0defragment.h            |    5 +-
 storage/xtradb/include/btr0pcur.h                  |    4 +-
 storage/xtradb/include/btr0pcur.ic                 |   20 +-
 storage/xtradb/include/buf0buf.h                   |   16 +-
 storage/xtradb/include/buf0buf.ic                  |    7 +
 storage/xtradb/include/buf0checksum.h              |    9 +-
 storage/xtradb/include/buf0lru.h                   |    2 +
 storage/xtradb/include/buf0rea.h                   |   11 +-
 storage/xtradb/include/db0err.h                    |    6 +
 storage/xtradb/include/dict0crea.h                 |   19 +-
 storage/xtradb/include/dict0dict.h                 |   46 +-
 storage/xtradb/include/dict0dict.ic                |    4 +-
 storage/xtradb/include/dict0mem.h                  |    8 +-
 storage/xtradb/include/fil0crypt.h                 |   66 +-
 storage/xtradb/include/fil0fil.h                   |   11 +-
 storage/xtradb/include/fsp0pagecompress.ic         |   26 +-
 storage/xtradb/include/fsp0types.h                 |   18 +-
 storage/xtradb/include/fts0fts.h                   |    2 +-
 storage/xtradb/include/ha_prototypes.h             |   30 +-
 storage/xtradb/include/log0crypt.h                 |   70 +-
 storage/xtradb/include/log0recv.h                  |    2 +-
 storage/xtradb/include/os0file.h                   |   26 +-
 storage/xtradb/include/os0file.ic                  |    6 +-
 storage/xtradb/include/page0cur.ic                 |   17 +-
 storage/xtradb/include/page0page.h                 |   26 +-
 storage/xtradb/include/page0types.h                |    4 +
 storage/xtradb/include/page0zip.h                  |   21 +-
 storage/xtradb/include/rem0rec.h                   |    2 +-
 storage/xtradb/include/row0ftsort.h                |    6 +
 storage/xtradb/include/row0merge.h                 |   27 +-
 storage/xtradb/include/row0mysql.h                 |    5 +-
 storage/xtradb/include/row0purge.h                 |   12 +-
 storage/xtradb/include/srv0mon.h                   |    2 +
 storage/xtradb/include/srv0srv.h                   |    1 -
 storage/xtradb/include/univ.i                      |    9 +-
 storage/xtradb/lock/lock0lock.cc                   |   35 +-
 storage/xtradb/log/log0crypt.cc                    |  152 +-
 storage/xtradb/log/log0log.cc                      |    3 +
 storage/xtradb/log/log0recv.cc                     |  200 +-
 .../storage_engine/type_spatial_indexes.rdiff      |    4 +-
 storage/xtradb/os/os0file.cc                       |   88 +-
 storage/xtradb/page/page0page.cc                   |   55 +-
 storage/xtradb/page/page0zip.cc                    |  126 +-
 storage/xtradb/pars/pars0pars.cc                   |    3 +-
 storage/xtradb/row/row0ftsort.cc                   |   86 +-
 storage/xtradb/row/row0import.cc                   |  121 +-
 storage/xtradb/row/row0ins.cc                      |   99 +-
 storage/xtradb/row/row0log.cc                      |    4 +-
 storage/xtradb/row/row0merge.cc                    |  380 +-
 storage/xtradb/row/row0mysql.cc                    |  147 +-
 storage/xtradb/row/row0purge.cc                    |   79 +-
 storage/xtradb/row/row0sel.cc                      |   42 +-
 storage/xtradb/srv/srv0mon.cc                      |   10 +
 storage/xtradb/srv/srv0srv.cc                      |   13 +-
 storage/xtradb/srv/srv0start.cc                    |   75 +-
 storage/xtradb/sync/sync0arr.cc                    |    8 +-
 storage/xtradb/trx/trx0sys.cc                      |    4 -
 storage/xtradb/trx/trx0trx.cc                      |    6 +-
 storage/xtradb/ut/ut0ut.cc                         |    2 +
 strings/conf_to_src.c                              |    2 +-
 strings/ctype-big5.c                               |    1 +
 strings/ctype-bin.c                                |    9 +-
 strings/ctype-cp932.c                              |    1 +
 strings/ctype-czech.c                              |    3 +-
 strings/ctype-euc_kr.c                             |    1 +
 strings/ctype-eucjpms.c                            |   46 +-
 strings/ctype-gb2312.c                             |    1 +
 strings/ctype-gbk.c                                |    1 +
 strings/ctype-latin1.c                             |    3 +-
 strings/ctype-mb.c                                 |   37 +-
 strings/ctype-mb.ic                                |   64 +
 strings/ctype-simple.c                             |   29 +-
 strings/ctype-sjis.c                               |    1 +
 strings/ctype-tis620.c                             |    3 +-
 strings/ctype-uca.c                                |   66 +-
 strings/ctype-ucs2.c                               |  827 +---
 strings/ctype-ujis.c                               |   46 +-
 strings/ctype-utf8.c                               |  717 +--
 strings/ctype-win1250ch.c                          |    3 +-
 strings/ctype.c                                    |    2 +-
 strings/strcoll.ic                                 |   52 +-
 support-files/CMakeLists.txt                       |   32 +-
 support-files/RHEL4-SElinux/mysql.fc               |   41 -
 support-files/RHEL4-SElinux/mysql.te               |  147 -
 support-files/compiler_warnings.supp               |   17 +-
 support-files/mariadb.service.in                   |  123 +
 support-files/mariadb at .service.in                  |  133 +
 support-files/mysql.server.sh                      |    9 +
 support-files/policy/apparmor/README               |    5 +
 support-files/policy/apparmor/usr.sbin.mysqld      |  150 +
 .../policy/apparmor/usr.sbin.mysqld.local          |    4 +
 support-files/policy/selinux/README                |   20 +
 support-files/policy/selinux/mariadb-server.fc     |   10 +
 support-files/policy/selinux/mariadb-server.te     |   99 +
 support-files/rpm/enable_encryption.preset         |   20 +
 support-files/rpm/server-postin.sh                 |   14 +
 support-files/rpm/server.cnf                       |    4 +
 support-files/use_galera_new_cluster.conf          |   22 +
 tests/mysql_client_test.c                          |   22 +-
 unittest/mysys/CMakeLists.txt                      |    5 +-
 unittest/mysys/aes-t.c                             |   99 +
 unittest/mysys/my_getopt-t.c                       |  356 ++
 unittest/sql/mf_iocache-t.cc                       |   41 +-
 unittest/strings/strings-t.c                       |  323 +-
 vio/viosslfactories.c                              |   47 +-
 win/packaging/CMakeLists.txt                       |    1 +
 win/packaging/ca/CMakeLists.txt                    |    6 +-
 win/packaging/ca/CustomAction.cpp                  |    2 +
 wsrep/wsrep_api.h                                  |    1 -
 wsrep/wsrep_dummy.c                                |   23 +-
 2612 files changed, 113814 insertions(+), 39241 deletions(-)

diff --cc mysql-test/r/enforce_storage_engine.result
index 2f04cc6,6b5e1f6..4f53a9a
--- a/mysql-test/r/enforce_storage_engine.result
+++ b/mysql-test/r/enforce_storage_engine.result
@@@ -117,7 -119,36 +119,38 @@@ t1	CREATE TABLE `t1` 
    PRIMARY KEY (`c1`)
  ) ENGINE=MEMORY DEFAULT CHARSET=latin1
  DROP TABLE t1;
+ set global sql_mode=default;
+ SET SESSION enforce_storage_engine=NULL;
+ SET GLOBAL enforce_storage_engine=NULL;
+ CREATE TABLE t3 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=MyISAM;
+ INSERT INTO t3 values (NULL, 'test');
+ SET SESSION enforce_storage_engine=Memory;
+ ALTER TABLE t3 ENGINE=MyISAM;
+ Warnings:
+ Note	1266	Using storage engine MEMORY for table 't3'
+ SHOW CREATE TABLE t3;
+ Table	Create Table
+ t3	CREATE TABLE `t3` (
+   `c1` int(11) NOT NULL AUTO_INCREMENT,
+   `c2` varchar(10) DEFAULT NULL,
+   PRIMARY KEY (`c1`)
+ ) ENGINE=MEMORY AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
+ DROP TABLE t3;
+ SET SESSION enforce_storage_engine=NULL;
+ CREATE TABLE t3 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=MyISAM;
+ INSERT INTO t3 values (NULL, 'test');
+ SET SESSION enforce_storage_engine=Memory;
+ ALTER TABLE t3 ADD COLUMN c3 INT;
+ SHOW CREATE TABLE t3;
+ Table	Create Table
+ t3	CREATE TABLE `t3` (
+   `c1` int(11) NOT NULL AUTO_INCREMENT,
+   `c2` varchar(10) DEFAULT NULL,
+   `c3` int(11) DEFAULT NULL,
+   PRIMARY KEY (`c1`)
+ ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1
+ DROP TABLE t3;
  SET SESSION enforce_storage_engine=NULL;
 +DROP TABLE t1;
 +SET SESSION enforce_storage_engine=NULL;
  SET GLOBAL enforce_storage_engine=NULL;
diff --cc storage/xtradb/fil/fil0pagecompress.cc
index ff8541a,4451116..cf7c9af
--- a/storage/xtradb/fil/fil0pagecompress.cc
+++ b/storage/xtradb/fil/fil0pagecompress.cc
@@@ -364,8 -387,9 +387,12 @@@ fil_compress_page
  	/* Actual write needs to be alligned on block size */
  	if (write_size % block_size) {
  		size_t tmp = write_size;
- 
++#ifdef UNIV_DEBUG
++		ut_a(block_size > 0);
++#endif
  		write_size =  (size_t)ut_uint64_align_up((ib_uint64_t)write_size, block_size);
+ 		/* Clean up the end of buffer */
+ 		memset(out_buf+tmp, 0, write_size - tmp);
  #ifdef UNIV_DEBUG
  		ut_a(write_size > 0 && ((write_size % block_size) == 0));
  		ut_a(write_size >= tmp);


More information about the commits mailing list