lp:~laurynas-biveinis/percona-server/merge-5.6.21
Created by
Laurynas Biveinis
and last modified
Only
Laurynas Biveinis
can upload to this branch. If you are
Laurynas Biveinis
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Laurynas Biveinis (community): Approve
-
Diff: 18766 lines (+8330/-2079)276 files modifiedVERSION (+2/-2)
client/mysql.cc (+11/-0)
client/mysqlbinlog.cc (+72/-32)
client/mysqldump.c (+2/-1)
cmake/dtrace.cmake (+7/-1)
extra/yassl/README (+25/-9)
extra/yassl/certs/ca-cert.pem (+50/-50)
extra/yassl/certs/client-cert.pem (+50/-50)
extra/yassl/certs/client-keyEnc.pem (+8/-26)
extra/yassl/certs/dsa1024.pem (+12/-0)
extra/yassl/certs/dsa512.pem (+0/-8)
extra/yassl/certs/server-cert.pem (+113/-97)
extra/yassl/certs/server-keyEnc.pem (+26/-26)
extra/yassl/include/buffer.hpp (+14/-4)
extra/yassl/include/openssl/ssl.h (+1/-1)
extra/yassl/src/buffer.cpp (+88/-27)
extra/yassl/src/handshake.cpp (+17/-8)
extra/yassl/src/yassl_imp.cpp (+161/-18)
extra/yassl/src/yassl_int.cpp (+4/-3)
extra/yassl/taocrypt/include/asn.hpp (+3/-3)
extra/yassl/taocrypt/include/block.hpp (+3/-3)
extra/yassl/taocrypt/include/integer.hpp (+2/-2)
extra/yassl/taocrypt/include/pwdbased.hpp (+3/-5)
extra/yassl/taocrypt/include/runtime.hpp (+14/-3)
extra/yassl/taocrypt/include/sha.hpp (+1/-1)
extra/yassl/taocrypt/src/aes.cpp (+9/-10)
extra/yassl/taocrypt/src/algebra.cpp (+5/-4)
extra/yassl/taocrypt/src/arc4.cpp (+5/-6)
extra/yassl/taocrypt/src/asn.cpp (+4/-10)
extra/yassl/taocrypt/src/blowfish.cpp (+4/-4)
extra/yassl/taocrypt/src/des.cpp (+5/-5)
extra/yassl/taocrypt/src/integer.cpp (+16/-22)
extra/yassl/taocrypt/src/md5.cpp (+5/-5)
extra/yassl/taocrypt/src/misc.cpp (+10/-12)
extra/yassl/taocrypt/src/rabbit.cpp (+7/-7)
extra/yassl/taocrypt/src/random.cpp (+2/-1)
extra/yassl/taocrypt/src/ripemd.cpp (+7/-6)
extra/yassl/taocrypt/src/sha.cpp (+5/-6)
extra/yassl/taocrypt/src/twofish.cpp (+6/-7)
man/comp_err.1 (+2/-2)
man/innochecksum.1 (+2/-2)
man/msql2mysql.1 (+2/-2)
man/my_print_defaults.1 (+2/-2)
man/myisam_ftdump.1 (+2/-2)
man/myisamchk.1 (+2/-2)
man/myisamlog.1 (+2/-2)
man/myisampack.1 (+2/-2)
man/mysql-stress-test.pl.1 (+2/-2)
man/mysql-test-run.pl.1 (+3/-3)
man/mysql.1 (+24/-4)
man/mysql.server.1 (+4/-4)
man/mysql_client_test.1 (+2/-2)
man/mysql_config.1 (+2/-2)
man/mysql_config_editor.1 (+2/-2)
man/mysql_convert_table_format.1 (+3/-3)
man/mysql_find_rows.1 (+2/-2)
man/mysql_fix_extensions.1 (+2/-2)
man/mysql_install_db.1 (+23/-2)
man/mysql_plugin.1 (+2/-2)
man/mysql_secure_installation.1 (+3/-3)
man/mysql_setpermission.1 (+3/-3)
man/mysql_tzinfo_to_sql.1 (+2/-2)
man/mysql_upgrade.1 (+271/-30)
man/mysql_waitpid.1 (+2/-2)
man/mysql_zap.1 (+2/-2)
man/mysqlaccess.1 (+2/-2)
man/mysqladmin.1 (+23/-3)
man/mysqlbinlog.1 (+49/-7)
man/mysqlbug.1 (+2/-2)
man/mysqlcheck.1 (+27/-6)
man/mysqld.8 (+2/-2)
man/mysqld_multi.1 (+3/-3)
man/mysqld_safe.1 (+8/-22)
man/mysqldump.1 (+23/-3)
man/mysqldumpslow.1 (+2/-2)
man/mysqlhotcopy.1 (+2/-2)
man/mysqlimport.1 (+23/-3)
man/mysqlshow.1 (+23/-3)
man/mysqlslap.1 (+2/-2)
man/mysqltest.1 (+2/-2)
man/ndb-common-options.1 (+21/-21)
man/ndb_blob_tool.1 (+10/-10)
man/ndb_config.1 (+45/-39)
man/ndb_cpcd.1 (+2/-2)
man/ndb_delete_all.1 (+14/-13)
man/ndb_desc.1 (+17/-17)
man/ndb_drop_index.1 (+8/-8)
man/ndb_drop_table.1 (+7/-7)
man/ndb_error_reporter.1 (+14/-13)
man/ndb_index_stat.1 (+228/-168)
man/ndb_mgm.1 (+6/-6)
man/ndb_mgmd.8 (+51/-44)
man/ndb_print_backup_file.1 (+2/-2)
man/ndb_print_schema_file.1 (+2/-2)
man/ndb_print_sys_file.1 (+2/-2)
man/ndb_restore.1 (+136/-89)
man/ndb_select_all.1 (+19/-19)
man/ndb_select_count.1 (+13/-13)
man/ndb_setup.py.1 (+43/-35)
man/ndb_show_tables.1 (+10/-10)
man/ndb_size.pl.1 (+20/-20)
man/ndb_waiter.1 (+14/-14)
man/ndbd.8 (+51/-38)
man/ndbd_redo_log_reader.1 (+7/-7)
man/ndbinfo_select_all.1 (+30/-18)
man/ndbmtd.8 (+2/-2)
man/perror.1 (+2/-2)
man/replace.1 (+2/-2)
man/resolve_stack_dump.1 (+2/-2)
man/resolveip.1 (+2/-2)
mysql-test/extra/rpl_tests/rpl_gtids_restart_slave_io_lost_trx.test (+112/-0)
mysql-test/include/begin_include_file.inc (+1/-0)
mysql-test/include/save_io_thread_pos.inc (+1/-1)
mysql-test/include/show_all_binlogs.inc (+66/-0)
mysql-test/include/show_all_relay_logs.inc (+70/-0)
mysql-test/include/subquery_sj.inc (+80/-0)
mysql-test/include/sync_slave_sql.inc (+1/-1)
mysql-test/include/wait_for_slave_param.inc (+1/-1)
mysql-test/include/wait_for_slave_sql_to_stop.inc (+1/-0)
mysql-test/include/write_result_to_file.inc (+31/-3)
mysql-test/r/ctype_cp932.result (+35/-0)
mysql-test/r/lock_sync.result (+41/-2)
mysql-test/r/log_errchk.result (+10/-0)
mysql-test/r/mysqld--help-notwin.result (+14/-0)
mysql-test/r/mysqld--help-win.result (+14/-0)
mysql-test/r/mysqldump.result (+12/-0)
mysql-test/r/partition_innodb.result (+34/-0)
mysql-test/r/query_cache.result (+56/-0)
mysql-test/r/subquery_sj_all.result (+79/-0)
mysql-test/r/subquery_sj_all_bka.result (+79/-0)
mysql-test/r/subquery_sj_all_bka_nixbnl.result (+79/-0)
mysql-test/r/subquery_sj_all_bkaunique.result (+79/-0)
mysql-test/r/subquery_sj_dupsweed.result (+79/-0)
mysql-test/r/subquery_sj_dupsweed_bka.result (+79/-0)
mysql-test/r/subquery_sj_dupsweed_bka_nixbnl.result (+79/-0)
mysql-test/r/subquery_sj_dupsweed_bkaunique.result (+79/-0)
mysql-test/r/subquery_sj_firstmatch.result (+79/-0)
mysql-test/r/subquery_sj_firstmatch_bka.result (+79/-0)
mysql-test/r/subquery_sj_firstmatch_bka_nixbnl.result (+79/-0)
mysql-test/r/subquery_sj_firstmatch_bkaunique.result (+79/-0)
mysql-test/r/subquery_sj_loosescan.result (+79/-0)
mysql-test/r/subquery_sj_loosescan_bka.result (+79/-0)
mysql-test/r/subquery_sj_loosescan_bka_nixbnl.result (+79/-0)
mysql-test/r/subquery_sj_loosescan_bkaunique.result (+79/-0)
mysql-test/r/subquery_sj_mat.result (+79/-0)
mysql-test/r/subquery_sj_mat_bka.result (+79/-0)
mysql-test/r/subquery_sj_mat_bka_nixbnl.result (+79/-0)
mysql-test/r/subquery_sj_mat_bkaunique.result (+79/-0)
mysql-test/r/subquery_sj_mat_nosj.result (+79/-0)
mysql-test/r/subquery_sj_none.result (+79/-0)
mysql-test/r/subquery_sj_none_bka.result (+79/-0)
mysql-test/r/subquery_sj_none_bka_nixbnl.result (+79/-0)
mysql-test/r/subquery_sj_none_bkaunique.result (+79/-0)
mysql-test/std_data/dtrace.d (+0/-2)
mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_start_stop.result (+16/-176)
mysql-test/suite/binlog/r/binlog_mysqlbinlog_concat.result (+20/-0)
mysql-test/suite/binlog/r/binlog_mysqlbinlog_start_stop.result (+0/-176)
mysql-test/suite/binlog/r/binlog_simplified_binlog_gtid_recovery.result (+47/-0)
mysql-test/suite/binlog/t/binlog_mysqlbinlog_concat.test (+103/-0)
mysql-test/suite/binlog/t/binlog_simplified_binlog_gtid_recovery-master.opt (+1/-0)
mysql-test/suite/binlog/t/binlog_simplified_binlog_gtid_recovery.test (+120/-0)
mysql-test/suite/innodb/r/add_foreign_key.result (+31/-0)
mysql-test/suite/innodb/r/index_tree_operation.result (+55/-0)
mysql-test/suite/innodb/r/innodb-alter-tempfile.result (+38/-0)
mysql-test/suite/innodb/t/add_foreign_key.test (+38/-0)
mysql-test/suite/innodb/t/index_tree_operation.test (+74/-0)
mysql-test/suite/innodb/t/innodb-alter-tempfile.test (+72/-0)
mysql-test/suite/parts/r/partition_debug.result (+16/-0)
mysql-test/suite/parts/t/partition_debug.test (+18/-0)
mysql-test/suite/rpl/r/rpl_drop_temp_gtid.result (+35/-0)
mysql-test/suite/rpl/r/rpl_gtid_server_sighup.result (+1/-0)
mysql-test/suite/rpl/r/rpl_gtid_stress_failover.result (+1/-0)
mysql-test/suite/rpl/r/rpl_gtids_restart_slave_io_lost_trx.result (+74/-0)
mysql-test/suite/rpl/r/rpl_mts_gtids_restart_slave_io_lost_trx.result (+74/-0)
mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result (+4/-3)
mysql-test/suite/rpl/r/rpl_rotate_gtid.result (+39/-0)
mysql-test/suite/rpl/r/rpl_row_hash_scan_sanity.result (+21/-0)
mysql-test/suite/rpl/r/rpl_semi_sync_future_logpos.result (+32/-0)
mysql-test/suite/rpl/r/rpl_semi_sync_shutdown_hang.result (+24/-0)
mysql-test/suite/rpl/r/rpl_server_uuid.result (+22/-1)
mysql-test/suite/rpl/r/rpl_sql_thread_killed_waiting_commit_lock.result (+38/-0)
mysql-test/suite/rpl/r/rpl_stm_until_pos_middle_gtid.result (+27/-0)
mysql-test/suite/rpl/t/rpl_drop_temp_gtid.test (+53/-0)
mysql-test/suite/rpl/t/rpl_gtid_server_sighup.test (+10/-0)
mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test (+20/-7)
mysql-test/suite/rpl/t/rpl_gtids_restart_slave_io_lost_trx.test (+12/-0)
mysql-test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx.test (+13/-0)
mysql-test/suite/rpl/t/rpl_parallel_seconds_behind_master.test (+5/-24)
mysql-test/suite/rpl/t/rpl_rotate_gtid.test (+95/-0)
mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock.test (+4/-0)
mysql-test/suite/rpl/t/rpl_row_hash_scan_sanity.test (+38/-0)
mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos.test (+66/-0)
mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang.test (+64/-0)
mysql-test/suite/rpl/t/rpl_server_uuid.cnf (+8/-0)
mysql-test/suite/rpl/t/rpl_server_uuid.test (+63/-1)
mysql-test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock.test (+122/-0)
mysql-test/suite/rpl/t/rpl_stm_until_pos_middle_gtid.test (+91/-0)
mysql-test/suite/sys_vars/r/simplified_binlog_gtid_recovery_basic.result (+21/-0)
mysql-test/suite/sys_vars/t/simplified_binlog_gtid_recovery_basic.test (+19/-0)
mysql-test/t/ctype_cp932.test (+29/-0)
mysql-test/t/lock_sync.test (+57/-2)
mysql-test/t/log_errchk.test (+65/-0)
mysql-test/t/mysqldump.test (+12/-0)
mysql-test/t/partition_innodb.test (+42/-0)
mysql-test/t/query_cache.test (+53/-2)
packaging/rpm-fedora/mysql.spec.in (+9/-1)
packaging/rpm-oel/mysql.spec.in (+22/-15)
plugin/innodb_memcached/daemon_memcached/daemon/memcached.c (+6/-0)
plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c (+8/-1)
plugin/semisync/semisync_master.cc (+25/-5)
scripts/mysql_system_tables_fix.sql (+17/-0)
sql-common/client.c (+14/-5)
sql/binlog.cc (+136/-36)
sql/binlog.h (+6/-2)
sql/field.cc (+31/-28)
sql/field.h (+3/-2)
sql/ha_partition.cc (+1/-0)
sql/item.cc (+26/-3)
sql/item_row.cc (+25/-1)
sql/item_row.h (+1/-0)
sql/item_strfunc.cc (+20/-0)
sql/key.cc (+83/-1)
sql/key.h (+4/-1)
sql/log.cc (+5/-0)
sql/log_event.cc (+160/-67)
sql/log_event.h (+68/-8)
sql/mysqld.cc (+5/-1)
sql/mysqld.h (+3/-1)
sql/rpl_info_table_access.cc (+7/-8)
sql/rpl_info_table_access.h (+3/-3)
sql/rpl_master.cc (+52/-12)
sql/rpl_rli.cc (+3/-4)
sql/rpl_rli.h (+5/-2)
sql/rpl_rli_pdb.cc (+9/-0)
sql/rpl_rli_pdb.h (+8/-0)
sql/rpl_slave.cc (+119/-7)
sql/rpl_utility.cc (+19/-6)
sql/rpl_utility.h (+11/-3)
sql/sql_admin.cc (+3/-2)
sql/sql_optimizer.cc (+36/-8)
sql/sql_plugin.cc (+6/-0)
sql/sql_priv.h (+28/-1)
sql/sql_tmp_table.cc (+13/-4)
sql/sql_tmp_table.h (+3/-2)
sql/sys_vars.cc (+26/-34)
storage/innobase/api/api0api.cc (+6/-8)
storage/innobase/btr/btr0btr.cc (+136/-0)
storage/innobase/btr/btr0cur.cc (+25/-4)
storage/innobase/buf/buf0buf.cc (+1/-0)
storage/innobase/dict/dict0dict.cc (+16/-0)
storage/innobase/dict/dict0load.cc (+2/-0)
storage/innobase/dict/dict0mem.cc (+113/-13)
storage/innobase/handler/ha_innodb.cc (+26/-33)
storage/innobase/handler/ha_innodb.h (+0/-7)
storage/innobase/handler/handler0alter.cc (+34/-10)
storage/innobase/include/dict0mem.h (+72/-8)
storage/innobase/include/dict0types.h (+1/-0)
storage/innobase/include/row0mysql.h (+8/-0)
storage/innobase/lock/lock0lock.cc (+3/-2)
storage/innobase/row/row0ins.cc (+1/-11)
storage/innobase/row/row0mysql.cc (+52/-1)
storage/innobase/row/row0purge.cc (+41/-7)
storage/innobase/row/row0sel.cc (+6/-10)
storage/innobase/srv/srv0srv.cc (+2/-0)
storage/innobase/trx/trx0roll.cc (+4/-15)
storage/innobase/trx/trx0trx.cc (+7/-1)
strings/ctype-mb.c (+2/-2)
strings/decimal.c (+2/-2)
support-files/mysql.spec.sh (+6/-4)
tests/mysql_client_test.c (+47/-1)
Related bugs
Related blueprints
Merge MySQL 5.6.21
(Essential)
Branch information
- Owner:
- Laurynas Biveinis
- Status:
- Merged
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:percona-server/5.6