[Commits] 5a71e6b: Merge branch 'bb-10.2-ext' into bb-10-ext-mdev-13369

IgorBabaev igor at mariadb.com
Fri Aug 11 02:23:26 EEST 2017


revision-id: 5a71e6bd5a61dff6d549d2c4f5927bbbd7ebcfee (mariadb-10.2.2-571-g5a71e6b)
parent(s): 1710dd2bf286f9a240f380925a0067c57c1b29f9 bf75dcac89d1496032015526dc6ce78d327e329f
author: Igor Babaev
committer: Igor Babaev
timestamp: 2017-08-10 16:23:26 -0700
message:

Merge branch 'bb-10.2-ext' into bb-10-ext-mdev-13369

# Conflicts:
#	mysql-test/r/derived_cond_pushdown.result
#	mysql-test/t/derived_cond_pushdown.test
#	sql/sql_derived.cc
#	sql/sql_select.cc
#	sql/sql_select.h


 .travis.compiler.sh                                |    4 +-
 .travis.yml                                        |    7 +-
 debian/mariadb-server-core-10.2.install            |    1 +
 extra/CMakeLists.txt                               |    1 -
 extra/innochecksum.cc                              |  964 +++----
 mysql-test/include/wait_innodb_all_purged.inc      |   60 -
 mysql-test/r/commit_1innodb.result                 |    2 +-
 mysql-test/r/create_drop_binlog.result             |    2 +-
 mysql-test/r/create_drop_view.result               |    2 +-
 mysql-test/r/derived_cond_pushdown.result          |  176 +-
 mysql-test/r/drop.result                           |    8 +-
 mysql-test/r/func_json.result                      |   33 +
 mysql-test/r/get_diagnostics.result                |    2 +-
 mysql-test/r/gis-json.result                       |   28 +
 mysql-test/r/grant.result                          |    2 +-
 mysql-test/r/profiling.result                      |    2 +-
 mysql-test/r/selectivity.result                    |    4 +-
 mysql-test/r/selectivity_innodb.result             |    4 +-
 mysql-test/r/signal.result                         |   34 +-
 mysql-test/r/signal_demo3.result                   |   42 +-
 mysql-test/r/sp-error.result                       |    4 +-
 mysql-test/r/sp-group.result                       |    2 +-
 mysql-test/r/sp.result                             |    4 +-
 mysql-test/r/view.result                           |    2 +-
 mysql-test/r/warnings.result                       |    2 +-
 mysql-test/r/win.result                            |   12 +
 mysql-test/suite/binlog/r/binlog_innodb.result     |   10 +
 mysql-test/suite/binlog/t/binlog_innodb.test       |   29 +
 mysql-test/suite/encryption/r/innochecksum.result  |   26 +-
 .../suite/encryption/r/innodb_encrypt_log.result   |    1 +
 mysql-test/suite/encryption/t/innochecksum.test    |  211 +-
 .../suite/encryption/t/innodb_encrypt_log.test     |    5 +
 mysql-test/suite/funcs_1/r/innodb_views.result     |    6 +-
 mysql-test/suite/funcs_1/r/memory_views.result     |    6 +-
 .../suite/gcol/r/innodb_virtual_debug_purge.result |   27 +-
 .../suite/gcol/r/innodb_virtual_purge.result       |    5 +
 .../suite/gcol/t/innodb_virtual_debug_purge.test   |   26 +-
 mysql-test/suite/gcol/t/innodb_virtual_purge.test  |   11 +-
 .../include/innodb_merge_threshold_delete.inc      |   20 +-
 .../include/innodb_merge_threshold_secondary.inc   |   19 +-
 .../include/innodb_merge_threshold_update.inc      |    1 -
 .../suite/innodb/r/index_merge_threshold.result    |  115 +-
 .../innodb/r/innodb_defragment_fill_factor.result  |    4 +-
 .../suite/innodb/t/index_merge_threshold.test      |    5 +-
 .../innodb/t/innodb_defragment_fill_factor.test    |   11 +-
 .../suite/innodb_zip/r/innochecksum_2.result       |    8 +-
 .../suite/innodb_zip/r/innochecksum_3.result       |   36 +-
 mysql-test/suite/innodb_zip/t/innochecksum_3.test  |    2 +
 mysql-test/suite/plugins/r/locales.result          |    4 +-
 mysql-test/suite/rpl/r/rpl_create_drop_view.result |    2 +-
 mysql-test/suite/rpl/r/rpl_sp.result               |    4 +-
 mysql-test/suite/sql_sequence/alter.result         |    2 +-
 mysql-test/suite/sql_sequence/create.result        |   14 +-
 mysql-test/t/derived_cond_pushdown.test            |   19 +-
 mysql-test/t/func_json.test                        |   21 +
 mysql-test/t/gis-json.test                         |   17 +
 mysql-test/t/win.test                              |   11 +
 sql/handler.cc                                     |   18 +-
 sql/item_cmpfunc.cc                                |   10 +
 sql/item_geofunc.cc                                |   56 +-
 sql/item_jsonfunc.cc                               |  164 +-
 sql/item_jsonfunc.h                                |    4 +-
 sql/share/CMakeLists.txt                           |    1 +
 sql/share/errmsg-utf8.txt                          |  287 +-
 sql/sp.cc                                          |  207 +-
 sql/sp.h                                           |    8 +
 sql/sp_head.cc                                     |    2 +-
 sql/sp_head.h                                      |    2 +-
 sql/spatial.cc                                     |   99 +-
 sql/spatial.h                                      |   23 +-
 sql/sql_acl.cc                                     |   25 +-
 sql/sql_derived.cc                                 |   13 +-
 sql/sql_lex.cc                                     |   63 +-
 sql/sql_lex.h                                      |   13 +-
 sql/sql_locale.cc                                  |    5 +-
 sql/sql_parse.cc                                   |   29 +-
 sql/sql_parse.h                                    |    6 +-
 sql/sql_select.cc                                  |   31 +-
 sql/sql_select.h                                   |    3 +-
 sql/sql_sequence.cc                                |   20 +-
 sql/sql_sequence.h                                 |    3 +-
 sql/sql_yacc.yy                                    |   48 +-
 sql/sql_yacc_ora.yy                                |   60 +-
 storage/innobase/buf/buf0buf.cc                    |  135 +-
 storage/innobase/fil/fil0crypt.cc                  |    1 +
 storage/innobase/handler/ha_innodb.cc              |   20 +-
 storage/innobase/handler/ha_innodb.h               |    5 -
 storage/innobase/ibuf/ibuf0ibuf.cc                 |    3 +-
 storage/innobase/include/buf0buf.h                 |    9 +
 storage/innobase/include/fil0crypt.h               |    3 +
 storage/innobase/include/fil0fil.h                 |   23 +-
 storage/innobase/include/fsp0fsp.h                 |    3 +-
 storage/innobase/include/fsp0fsp.ic                |    2 +
 storage/innobase/include/mach0data.h               |    7 +-
 storage/innobase/include/mach0data.ic              |    4 +-
 storage/innobase/include/page0page.h               |    4 +-
 storage/innobase/include/page0page.ic              |   20 +-
 storage/innobase/include/rem0rec.h                 |    4 +
 storage/innobase/include/row0mysql.h               |    5 +-
 storage/innobase/include/univ.i                    |   13 +-
 storage/innobase/log/log0log.cc                    |    3 +-
 storage/innobase/log/log0recv.cc                   |   45 +-
 storage/innobase/mtr/mtr0mtr.cc                    |    3 +
 storage/innobase/page/page0zip.cc                  |  103 +-
 storage/innobase/row/row0mysql.cc                  |   32 +-
 storage/innobase/trx/trx0purge.cc                  |    6 +-
 storage/innobase/trx/trx0trx.cc                    |   27 +-
 storage/rocksdb/CMakeLists.txt                     |   25 +-
 storage/rocksdb/README                             |   24 +-
 storage/rocksdb/build_rocksdb.cmake                |   16 +-
 storage/rocksdb/ha_rocksdb.cc                      | 2830 ++++++++++++++------
 storage/rocksdb/ha_rocksdb.h                       |  178 +-
 storage/rocksdb/ha_rocksdb_proto.h                 |   14 +-
 .../mysql-test/rocksdb/include/deadlock_stats.inc  |   52 +
 .../rocksdb/include/restart_mysqld_with_option.inc |   31 +
 .../mysql-test/rocksdb/include/simple_deadlock.inc |   29 +
 .../mysql-test/rocksdb/r/add_index_inplace.result  |   43 +
 .../rocksdb/r/add_unique_index_inplace.result      |   18 +-
 .../rocksdb/r/allow_no_primary_key.result          |   15 +-
 .../mysql-test/rocksdb/r/bloomfilter.result        |  814 +++++-
 .../mysql-test/rocksdb/r/bloomfilter_skip.result   |  814 +++++-
 .../rocksdb/mysql-test/rocksdb/r/bulk_load.result  |   27 +-
 .../mysql-test/rocksdb/r/bulk_load_errors.result   |   29 +
 .../mysql-test/rocksdb/r/bulk_load_rev_cf.result   |   82 +
 .../rocksdb/r/bulk_load_rev_cf_and_data.result     |   82 +
 .../mysql-test/rocksdb/r/bulk_load_rev_data.result |   82 +
 .../rocksdb/r/cons_snapshot_read_committed.result  |   12 +-
 .../rocksdb/r/cons_snapshot_repeatable_read.result |    2 +-
 .../rocksdb/r/corrupted_data_reads_debug.result    |   10 +-
 .../mysql-test/rocksdb/r/deadlock_stats.result     |   14 +
 .../rocksdb/mysql-test/rocksdb/r/drop_table.result |   16 -
 .../mysql-test/rocksdb/r/drop_table2.result        |    6 +
 .../mysql-test/rocksdb/r/foreign_key.result        |    8 +-
 .../rocksdb/mysql-test/rocksdb/r/hermitage.result  |    6 +-
 .../rocksdb/mysql-test/rocksdb/r/i_s_ddl.result    |   10 +-
 .../rocksdb/r/index_merge_rocksdb.result           |   48 +
 .../rocksdb/r/index_merge_rocksdb2.result          | 1419 ++++++++++
 .../mysql-test/rocksdb/r/information_schema.result |    9 +-
 .../rocksdb/mysql-test/rocksdb/r/issue111.result   |    2 +-
 .../rocksdb/r/issue243_transactionStatus.result    |  155 ++
 .../rocksdb/mysql-test/rocksdb/r/issue255.result   |   21 +
 .../rocksdb/r/lock_wait_timeout_stats.result       |   27 +
 .../mysql-test/rocksdb/r/native_procedure.result   |  397 +++
 .../rocksdb/r/prefix_extractor_override.result     |   76 +
 .../rocksdb/mysql-test/rocksdb/r/rocksdb.result    |   92 +-
 .../rocksdb/r/rocksdb_cf_per_partition.result      |   14 +
 .../mysql-test/rocksdb/r/rocksdb_icp.result        |    4 +-
 .../mysql-test/rocksdb/r/rocksdb_locks.result      |    2 +-
 .../mysql-test/rocksdb/r/rocksdb_parts.result      |    7 +-
 .../mysql-test/rocksdb/r/rqg_runtime.result        |    1 +
 .../mysql-test/rocksdb/r/show_engine.result        |  164 +-
 .../mysql-test/rocksdb/r/singledelete.result       |   22 +-
 .../rocksdb/r/tbl_opt_data_index_dir.result        |    4 +-
 .../mysql-test/rocksdb/r/ttl_primary.result        |  491 ++++
 .../rocksdb/r/ttl_primary_read_filtering.result    |  254 ++
 .../rocksdb/r/ttl_primary_with_partitions.result   |  256 ++
 .../mysql-test/rocksdb/r/type_set_indexes.result   |   35 +
 .../mysql-test/rocksdb/r/type_varchar.result       |   35 +-
 .../mysql-test/rocksdb/r/varbinary_format.result   |  260 ++
 .../rocksdb/mysql-test/rocksdb/r/write_sync.result |   12 +-
 .../mysql-test/rocksdb/t/add_index_inplace.test    |   47 +-
 .../rocksdb/t/add_unique_index_inplace.test        |   23 +-
 .../mysql-test/rocksdb/t/allow_no_primary_key.test |   11 +-
 .../mysql-test/rocksdb/t/bloomfilter-master.opt    |    2 +-
 .../rocksdb/mysql-test/rocksdb/t/bloomfilter.inc   |    8 +
 storage/rocksdb/mysql-test/rocksdb/t/bulk_load.inc |  156 ++
 .../rocksdb/mysql-test/rocksdb/t/bulk_load.test    |  119 +-
 .../mysql-test/rocksdb/t/bulk_load_errors.test     |   36 +
 .../mysql-test/rocksdb/t/bulk_load_rev_cf.test     |    9 +
 .../rocksdb/t/bulk_load_rev_cf_and_data.test       |    9 +
 .../mysql-test/rocksdb/t/bulk_load_rev_data.test   |    9 +
 .../rocksdb/mysql-test/rocksdb/t/collation.test    |   39 +-
 .../mysql-test/rocksdb/t/collation_exception.test  |    2 +
 .../mysql-test/rocksdb/t/consistent_snapshot.inc   |   14 +-
 .../rocksdb/t/corrupted_data_reads_debug.test      |   10 +-
 .../mysql-test/rocksdb/t/deadlock_stats.test       |    3 +
 storage/rocksdb/mysql-test/rocksdb/t/delete.test   |    4 +-
 storage/rocksdb/mysql-test/rocksdb/t/disabled.def  |    5 +
 .../mysql-test/rocksdb/t/drop_table-master.opt     |    2 +-
 .../rocksdb/mysql-test/rocksdb/t/drop_table.test   |   43 -
 .../rocksdb/mysql-test/rocksdb/t/drop_table2.test  |    8 +
 .../mysql-test/rocksdb/t/duplicate_table.test      |    2 +-
 .../rocksdb/mysql-test/rocksdb/t/foreign_key.test  |    2 +
 .../rocksdb/t/index_merge_rocksdb-master.opt       |    1 +
 .../mysql-test/rocksdb/t/index_merge_rocksdb.test  |  109 +
 .../rocksdb/t/index_merge_rocksdb2-master.opt      |    1 +
 .../mysql-test/rocksdb/t/index_merge_rocksdb2.test |   70 +
 .../mysql-test/rocksdb/t/information_schema.test   |    4 +-
 storage/rocksdb/mysql-test/rocksdb/t/insert.test   |    4 +-
 .../rocksdb/t/issue243_transactionStatus.test      |   80 +
 storage/rocksdb/mysql-test/rocksdb/t/issue255.test |   19 +
 storage/rocksdb/mysql-test/rocksdb/t/issue314.test |    2 +-
 storage/rocksdb/mysql-test/rocksdb/t/loaddata.inc  |    2 +-
 .../rocksdb/t/lock_wait_timeout_stats.test         |   34 +
 .../rocksdb/t/native_procedure-master.opt          |    1 +
 .../mysql-test/rocksdb/t/native_procedure.test     |    2 +
 .../rocksdb/t/optimizer_loose_index_scans.test     |    1 +
 .../rocksdb/t/prefix_extractor_override-master.opt |    1 +
 .../rocksdb/t/prefix_extractor_override.test       |   98 +
 .../rocksdb/mysql-test/rocksdb/t/read_only_tx.test |    2 +-
 storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test  |   46 +-
 .../rocksdb/t/rocksdb_cf_per_partition.test        |   16 +
 .../rocksdb/mysql-test/rocksdb/t/rocksdb_icp.test  |    4 +-
 .../mysql-test/rocksdb/t/rocksdb_parts.test        |    7 +
 .../mysql-test/rocksdb/t/rollback_savepoint.test   |    2 +
 .../mysql-test/rocksdb/t/rpl_savepoint.test        |   18 +-
 .../mysql-test/rocksdb/t/rpl_statement.test        |    4 +-
 .../rocksdb/mysql-test/rocksdb/t/rqg_runtime.test  |    1 +
 .../t/select_for_update_skip_locked_nowait.test    |    2 +
 .../mysql-test/rocksdb/t/set_checkpoint.inc        |    2 +-
 .../rocksdb/mysql-test/rocksdb/t/show_engine.test  |    6 +-
 .../mysql-test/rocksdb/t/singledelete-master.opt   |    2 +-
 .../rocksdb/mysql-test/rocksdb/t/singledelete.test |   18 +-
 .../rocksdb/mysql-test/rocksdb/t/trx_info_rpl.test |    1 +
 .../mysql-test/rocksdb/t/ttl_primary-master.opt    |    2 +
 .../rocksdb/mysql-test/rocksdb/t/ttl_primary.test  |  547 ++++
 .../t/ttl_primary_read_filtering-master.opt        |    1 +
 .../rocksdb/t/ttl_primary_read_filtering.test      |  371 +++
 .../t/ttl_primary_with_partitions-master.opt       |    2 +
 .../rocksdb/t/ttl_primary_with_partitions.test     |  254 ++
 .../mysql-test/rocksdb/t/type_set_indexes.test     |   22 +-
 .../mysql-test/rocksdb/t/type_varchar-master.opt   |    1 +
 .../mysql-test/rocksdb/t/type_varchar_endspace.inc |    5 +-
 .../rocksdb/t/unsupported_tx_isolations.test       |    8 +-
 storage/rocksdb/mysql-test/rocksdb/t/update.test   |    4 +-
 .../mysql-test/rocksdb/t/varbinary_format.test     |  131 +
 .../rocksdb/mysql-test/rocksdb/t/write_sync.test   |   13 +-
 .../rocksdb_hotbackup/include/create_table.sh      |   16 +
 .../rocksdb_hotbackup/include/stream_run.sh        |   31 +-
 .../mysql-test/rocksdb_hotbackup/r/xbstream.result |    1 +
 .../mysql-test/rocksdb_hotbackup/t/xbstream.test   |    3 +
 .../r/rpl_skip_trx_api_binlog_format.result        |    2 +-
 .../r/singledelete_idempotent_recovery.result      |   24 +
 .../r/singledelete_idempotent_table.result         |   25 +
 .../rocksdb_rpl/t/multiclient_2pc-master.opt       |    1 +
 .../rocksdb_rpl/t/multiclient_2pc-mater.opt        |    1 -
 .../mysql-test/rocksdb_rpl/t/multiclient_2pc.test  |    2 +-
 .../rocksdb_rpl/t/rpl_gtid_crash_safe.test         |    1 +
 .../t/rpl_gtid_crash_safe_wal_corrupt.inc          |    1 +
 .../rocksdb_rpl/t/rpl_gtid_rocksdb_sys_header.test |    1 +
 .../rocksdb_rpl/t/rpl_no_unique_check_on_lag.test  |    1 +
 .../t/rpl_no_unique_check_on_lag_mts.test          |    1 +
 .../rocksdb_rpl/t/rpl_rocksdb_snapshot.test        |    5 +-
 .../t/rpl_rocksdb_snapshot_without_gtid.test       |    1 +
 .../t/rpl_rocksdb_stress_crash-slave.opt           |    1 +
 .../t/rpl_skip_trx_api_binlog_format.test          |    1 +
 .../t/singledelete_idempotent_recovery.cnf         |   15 +
 .../t/singledelete_idempotent_recovery.test        |   72 +
 .../t/singledelete_idempotent_table.cnf            |   15 +
 .../t/singledelete_idempotent_table.test           |   44 +
 .../mysql-test/rocksdb_sys_vars/r/all_vars.result  |    2 -
 ...db_allow_concurrent_memtable_write_basic.result |   63 +-
 .../r/rocksdb_background_sync_basic.result         |   68 -
 ...ocksdb_base_background_compactions_basic.result |    7 -
 .../r/rocksdb_create_checkpoint_basic.result       |    2 +-
 .../rocksdb_debug_ttl_read_filter_ts_basic.result  |   46 +
 .../r/rocksdb_debug_ttl_rec_ts_basic.result        |   46 +
 .../r/rocksdb_debug_ttl_snapshot_ts_basic.result   |   46 +
 .../r/rocksdb_delayed_write_rate_basic.result      |   20 +-
 .../r/rocksdb_disable_2pc_basic.result             |   75 -
 .../r/rocksdb_enable_2pc_basic.result              |   75 +
 .../r/rocksdb_enable_thread_tracking_basic.result  |    2 +-
 .../r/rocksdb_enable_ttl_basic.result              |   64 +
 .../rocksdb_enable_ttl_read_filtering_basic.result |   64 +
 ...enable_write_thread_adaptive_yield_basic.result |   63 +-
 .../r/rocksdb_flush_log_at_trx_commit_basic.result |   42 +-
 ...force_flush_memtable_and_lzero_now_basic.result |   50 +
 .../r/rocksdb_io_write_timeout_basic.result        |   86 +
 ...rocksdb_max_background_compactions_basic.result |   46 -
 .../r/rocksdb_max_background_flushes_basic.result  |    7 -
 .../r/rocksdb_max_background_jobs_basic.result     |   46 +
 .../r/rocksdb_reset_stats_basic.result             |   97 +
 ...rocksdb_sst_mgr_rate_bytes_per_sec_basic.result |   85 +
 .../r/rocksdb_update_cf_options_basic.result       |  108 +
 .../r/rocksdb_write_batch_max_bytes_basic.result   |   15 +
 .../mysql-test/rocksdb_sys_vars/t/all_vars.test    |    1 +
 ...ksdb_allow_concurrent_memtable_write_basic.test |   15 +-
 .../t/rocksdb_background_sync_basic.test           |   18 -
 .../rocksdb_base_background_compactions_basic.test |    7 -
 .../t/rocksdb_create_checkpoint_basic.test         |    2 +-
 .../t/rocksdb_debug_ttl_read_filter_ts_basic.test  |   16 +
 .../t/rocksdb_debug_ttl_rec_ts_basic.test          |   16 +
 .../t/rocksdb_debug_ttl_snapshot_ts_basic.test     |   16 +
 .../t/rocksdb_disable_2pc_basic.test               |   20 -
 .../t/rocksdb_enable_2pc_basic.test                |   20 +
 .../t/rocksdb_enable_ttl_basic.test                |   18 +
 .../t/rocksdb_enable_ttl_read_filtering_basic.test |   18 +
 ...b_enable_write_thread_adaptive_yield_basic.test |   15 +-
 .../t/rocksdb_flush_log_at_trx_commit_basic.test   |    3 +-
 ...b_force_flush_memtable_and_lzero_now_basic.test |   17 +
 .../t/rocksdb_io_write_timeout_basic.test          |   20 +
 .../rocksdb_max_background_compactions_basic.test  |   16 -
 .../t/rocksdb_max_background_flushes_basic.test    |    6 -
 .../t/rocksdb_max_background_jobs_basic.test       |   16 +
 .../t/rocksdb_reset_stats_basic.test               |   21 +
 .../rocksdb_sst_mgr_rate_bytes_per_sec_basic.test  |   22 +
 .../t/rocksdb_update_cf_options_basic.test         |   95 +
 ...e_direct_io_for_flush_and_compaction_basic.test |    2 +-
 .../t/rocksdb_write_batch_max_bytes_basic.test     |   26 +
 storage/rocksdb/rdb_buff.h                         |   10 +
 storage/rocksdb/rdb_cf_manager.cc                  |   87 +-
 storage/rocksdb/rdb_cf_manager.h                   |   27 +-
 storage/rocksdb/rdb_cf_options.cc                  |   49 +-
 storage/rocksdb/rdb_cf_options.h                   |    9 +-
 storage/rocksdb/rdb_compact_filter.h               |  118 +-
 storage/rocksdb/rdb_datadic.cc                     | 1201 ++++++---
 storage/rocksdb/rdb_datadic.h                      |  317 ++-
 storage/rocksdb/rdb_i_s.cc                         |  347 ++-
 storage/rocksdb/rdb_index_merge.cc                 |   22 +-
 storage/rocksdb/rdb_io_watchdog.cc                 |  239 ++
 storage/rocksdb/rdb_io_watchdog.h                  |  117 +
 storage/rocksdb/rdb_mariadb_port.h                 |    7 +
 storage/rocksdb/rdb_mariadb_server_port.cc         |   28 +
 storage/rocksdb/rdb_perf_context.cc                |   35 +-
 storage/rocksdb/rdb_sst_info.cc                    |  227 +-
 storage/rocksdb/rdb_sst_info.h                     |  130 +-
 storage/rocksdb/rdb_utils.cc                       |   16 +-
 storage/rocksdb/rdb_utils.h                        |    3 +
 storage/rocksdb/rocksdb                            |    2 +-
 storage/rocksdb/rocksdb-range-access.txt           |  145 +-
 strings/json_lib.c                                 |    4 +-
 321 files changed, 16318 insertions(+), 4080 deletions(-)


More information about the commits mailing list