revision-id: 953ca199fb62bcd190d2af4d6177f986564ec1ad (mariadb-10.3.6-136-g953ca19) parent(s): 27c3abde3071ad2010cbcda5b07435ad15364a70 be8709eb7bdf2a68a1c04fd8ab368113f5f39b63 author: Igor Babaev committer: Igor Babaev timestamp: 2019-02-12 23:19:43 -0800 message: Merge branch '10.4' into bb-10.4-mdev17096 cmake/build_configurations/mysql_release.cmake | 3 + cmake/wsrep.cmake | 20 +- extra/innochecksum.cc | 138 +- extra/mariabackup/fil_cur.cc | 32 +- extra/mariabackup/fil_cur.h | 7 +- extra/mariabackup/read_filt.cc | 2 +- extra/mariabackup/read_filt.h | 2 +- extra/mariabackup/write_filt.cc | 12 +- extra/mariabackup/xtrabackup.cc | 37 +- extra/mariabackup/xtrabackup.h | 9 +- libmysqld/CMakeLists.txt | 1 + mysql-test/main/failed_auth_unixsocket.result | 2 +- mysql-test/main/failed_auth_unixsocket.test | 2 +- mysql-test/main/information_schema.result | 3 + .../main/information_schema_all_engines.result | 8 +- mysql-test/main/mysql_upgrade-6984.result | 2 +- mysql-test/main/mysql_upgrade-6984.test | 2 +- mysql-test/main/mysqld--help.result | 8 + mysql-test/main/opt_trace.result | 3499 ++++++++++++++++++++ mysql-test/main/opt_trace.test | 335 ++ mysql-test/main/opt_trace_index_merge.result | 249 ++ mysql-test/main/opt_trace_index_merge.test | 21 + .../main/opt_trace_index_merge_innodb.result | 242 ++ mysql-test/main/opt_trace_index_merge_innodb.test | 31 + mysql-test/main/opt_trace_security.result | 396 +++ mysql-test/main/opt_trace_security.test | 197 ++ mysql-test/main/type_timestamp.result | 9 + mysql-test/main/type_timestamp.test | 8 + mysql-test/suite/funcs_1/r/is_columns_is.result | 8 + .../suite/funcs_1/r/is_columns_is_embedded.result | 8 + mysql-test/suite/funcs_1/r/is_tables_is.result | 50 + .../suite/funcs_1/r/is_tables_is_embedded.result | 50 + mysql-test/suite/galera/disabled.def | 1 - .../galera/r/galera_gcache_recover_manytrx.result | 2 + mysql-test/suite/galera/r/galera_sst_rsync2.result | 2 + .../galera/r/galera_var_load_data_splitting.result | 4 + mysql-test/suite/galera/t/galera_sst_mysqldump.cnf | 2 - .../r/galera_evs_suspect_timeout.result | 1 - .../t/galera_evs_suspect_timeout.test | 2 +- .../suite/innodb/r/alter_varchar_change.result | 18 +- .../suite/innodb/r/instant_alter_bugs.result | 47 + .../suite/innodb/r/instant_alter_import.result | 72 + .../suite/innodb/t/alter_varchar_change.test | 18 +- mysql-test/suite/innodb/t/instant_alter_bugs.test | 49 + .../suite/innodb/t/instant_alter_import.test | 84 + .../roles/i_s_applicable_roles_is_default.result | 2 +- .../roles/i_s_applicable_roles_is_default.test | 2 +- .../sys_vars/r/sysvars_server_embedded,32bit.rdiff | 319 +- .../sys_vars/r/sysvars_server_embedded.result | 28 + .../r/sysvars_server_notembedded,32bit.rdiff | 339 +- .../sys_vars/r/sysvars_server_notembedded.result | 28 + mysys/my_fopen.c | 5 +- .../mysql-test/user_variables/basic.result | 2 +- plugin/user_variables/user_variables.cc | 2 +- scripts/mysql_install_db.sh | 29 +- scripts/mysql_secure_installation.sh | 59 +- scripts/mysql_system_tables_data.sql | 9 +- scripts/wsrep_sst_mariabackup.sh | 4 +- scripts/wsrep_sst_rsync.sh | 23 +- sql/CMakeLists.txt | 1 + sql/ha_sequence.cc | 2 +- sql/handler.h | 1 + sql/my_json_writer.cc | 75 +- sql/my_json_writer.h | 425 ++- sql/mysqld.cc | 9 +- sql/mysqld.h | 3 +- sql/opt_range.cc | 845 ++++- sql/opt_range.h | 2 +- sql/opt_subselect.cc | 66 +- sql/opt_table_elimination.cc | 30 +- sql/opt_trace.cc | 722 ++++ sql/opt_trace.h | 201 ++ sql/opt_trace_context.h | 92 + sql/set_var.h | 9 + sql/sp_head.cc | 13 + sql/sp_head.h | 1 + sql/sql_class.cc | 14 + sql/sql_class.h | 15 + sql/sql_derived.cc | 49 +- sql/sql_explain.cc | 2 +- sql/sql_parse.cc | 13 +- sql/sql_parse.h | 2 +- sql/sql_prepare.cc | 12 + sql/sql_select.cc | 632 +++- sql/sql_show.cc | 7 + sql/sql_test.cc | 27 +- sql/sql_test.h | 2 + sql/sql_type.h | 8 +- sql/sql_view.cc | 10 + sql/sys_vars.cc | 18 + sql/table.cc | 2 + sql/wsrep_mysqld.cc | 15 +- sql/wsrep_server_state.cc | 1 + sql/wsrep_sst.cc | 17 +- storage/innobase/btr/btr0btr.cc | 115 +- storage/innobase/btr/btr0bulk.cc | 13 +- storage/innobase/btr/btr0cur.cc | 179 +- storage/innobase/btr/btr0defragment.cc | 18 +- storage/innobase/btr/btr0pcur.cc | 2 +- storage/innobase/btr/btr0scrub.cc | 22 +- storage/innobase/btr/btr0sea.cc | 2 +- storage/innobase/buf/buf0buf.cc | 166 +- storage/innobase/buf/buf0dblwr.cc | 82 +- storage/innobase/buf/buf0dump.cc | 8 +- storage/innobase/buf/buf0flu.cc | 11 +- storage/innobase/buf/buf0lru.cc | 68 +- storage/innobase/buf/buf0rea.cc | 99 +- storage/innobase/data/data0data.cc | 8 +- storage/innobase/dict/dict0boot.cc | 2 +- storage/innobase/dict/dict0crea.cc | 24 +- storage/innobase/dict/dict0dict.cc | 56 +- storage/innobase/dict/dict0stats.cc | 4 +- storage/innobase/fil/fil0crypt.cc | 103 +- storage/innobase/fil/fil0fil.cc | 140 +- storage/innobase/fil/fil0pagecompress.cc | 3 +- storage/innobase/fsp/fsp0file.cc | 43 +- storage/innobase/fsp/fsp0fsp.cc | 441 +-- storage/innobase/fts/fts0fts.cc | 4 +- storage/innobase/fts/fts0que.cc | 8 +- storage/innobase/fut/fut0lst.cc | 64 +- storage/innobase/gis/gis0rtree.cc | 8 +- storage/innobase/gis/gis0sea.cc | 11 +- storage/innobase/handler/ha_innodb.cc | 81 +- storage/innobase/handler/handler0alter.cc | 41 +- storage/innobase/handler/i_s.cc | 13 +- storage/innobase/ibuf/ibuf0ibuf.cc | 346 +- storage/innobase/include/btr0btr.h | 57 +- storage/innobase/include/btr0btr.ic | 14 +- storage/innobase/include/btr0cur.h | 16 +- storage/innobase/include/btr0types.h | 10 +- storage/innobase/include/buf0buf.h | 56 +- storage/innobase/include/buf0rea.h | 37 +- storage/innobase/include/dict0dict.h | 34 +- storage/innobase/include/dict0dict.ic | 22 - storage/innobase/include/fil0crypt.h | 41 +- storage/innobase/include/fil0fil.h | 59 +- storage/innobase/include/fsp0fsp.h | 106 +- storage/innobase/include/fsp0fsp.ic | 69 +- storage/innobase/include/fut0fut.h | 28 +- storage/innobase/include/fut0fut.ic | 68 - storage/innobase/include/ibuf0ibuf.h | 75 +- storage/innobase/include/ibuf0ibuf.ic | 49 +- storage/innobase/include/mem0mem.ic | 4 +- storage/innobase/include/mtr0types.h | 9 +- storage/innobase/include/os0file.h | 2 +- storage/innobase/include/page0size.h | 197 -- storage/innobase/include/page0zip.h | 15 +- storage/innobase/include/page0zip.ic | 21 +- storage/innobase/include/row0ext.h | 9 +- storage/innobase/include/trx0rseg.ic | 5 +- storage/innobase/include/trx0sys.h | 2 +- storage/innobase/include/trx0undo.ic | 8 +- storage/innobase/lock/lock0lock.cc | 2 +- storage/innobase/log/log0log.cc | 8 +- storage/innobase/log/log0recv.cc | 32 +- storage/innobase/mtr/mtr0mtr.cc | 2 +- storage/innobase/os/os0file.cc | 2 - storage/innobase/page/page0zip.cc | 17 +- storage/innobase/rem/rem0rec.cc | 8 +- storage/innobase/row/row0ext.cc | 32 +- storage/innobase/row/row0ftsort.cc | 4 +- storage/innobase/row/row0import.cc | 119 +- storage/innobase/row/row0log.cc | 18 +- storage/innobase/row/row0merge.cc | 17 +- storage/innobase/row/row0mysql.cc | 12 +- storage/innobase/row/row0purge.cc | 2 +- storage/innobase/row/row0row.cc | 4 +- storage/innobase/row/row0sel.cc | 16 +- storage/innobase/row/row0upd.cc | 39 +- storage/innobase/srv/srv0srv.cc | 2 - storage/innobase/srv/srv0start.cc | 13 +- storage/innobase/trx/trx0rec.cc | 34 +- storage/innobase/trx/trx0rseg.cc | 20 +- storage/innobase/trx/trx0undo.cc | 8 +- wsrep-lib | 2 +- 175 files changed, 10544 insertions(+), 2956 deletions(-) diff --cc sql/sql_select.cc index 38b0e7e,06205a4..1f12490 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@@ -64,7 -64,8 +64,9 @@@ #include "sys_vars_shared.h" #include "sp_head.h" #include "sp_rcontext.h" +#include "select_handler.h" + #include "my_json_writer.h" + #include "opt_trace.h" /* A key part number that means we're using a fulltext scan.