Merge lp://qastaging/~percona-core/percona-xtradb-cluster/pxc-5.6.22 into lp://qastaging/percona-xtradb-cluster
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~percona-core/percona-xtradb-cluster/pxc-5.6.22 |
Merge into: | lp://qastaging/percona-xtradb-cluster |
Diff against target: |
26005 lines (+15421/-2673) (has conflicts) 360 files modified
.gitignore (+3139/-0) CMakeLists.txt (+49/-46) Makefile-pxc (+2/-2) VERSION (+2/-2) build-ps/build-binary-nobzr.sh (+1/-0) build-ps/build-binary.sh (+2/-0) build-ps/debian/changelog (+45/-7) build-ps/debian/control.tokudb (+0/-268) build-ps/debian/percona-server-tokudb-5.6.files (+0/-3) build-ps/debian/percona-server-tokudb-5.6.postinst (+0/-18) build-ps/debian/rules (+2/-0) build-ps/debian/rules.tokudb (+0/-314) build-ps/percona-xtradb-cluster.spec (+3/-1) client/mysqlbinlog.cc (+4/-3) client/mysqldump.c (+15/-4) cmake/build_configurations/compiler_options.cmake (+9/-40) cmake/build_configurations/feature_set.cmake (+0/-1) cmake/build_configurations/mysql_release.cmake (+1/-0) cmake/compile_flags.cmake (+44/-0) cmake/dtrace.cmake (+5/-4) cmake/maintainer.cmake (+37/-42) cmake/os/Darwin.cmake (+0/-18) cmake/os/WindowsCache.cmake (+3/-3) config.h.cmake (+1/-1) configure.cmake (+0/-19) extra/replace.c (+2/-2) extra/yassl/README (+9/-0) extra/yassl/include/openssl/ssl.h (+1/-1) extra/yassl/taocrypt/src/rsa.cpp (+1/-1) include/my_global.h (+0/-3) include/my_pthread.h (+13/-3) libmysqld/lib_sql.cc (+3/-0) man/comp_err.1 (+2/-2) man/innochecksum.1 (+2/-2) man/msql2mysql.1 (+2/-2) man/my_print_defaults.1 (+3/-3) man/myisam_ftdump.1 (+2/-2) man/myisamchk.1 (+3/-3) man/myisamlog.1 (+2/-2) man/myisampack.1 (+2/-2) man/mysql-stress-test.pl.1 (+2/-2) man/mysql-test-run.pl.1 (+2/-2) man/mysql.1 (+4/-4) man/mysql.server.1 (+2/-2) man/mysql_client_test.1 (+2/-2) man/mysql_config.1 (+2/-2) man/mysql_config_editor.1 (+5/-5) man/mysql_convert_table_format.1 (+2/-2) man/mysql_find_rows.1 (+2/-2) man/mysql_fix_extensions.1 (+2/-2) man/mysql_install_db.1 (+29/-19) man/mysql_plugin.1 (+3/-3) man/mysql_secure_installation.1 (+2/-2) man/mysql_setpermission.1 (+2/-2) man/mysql_tzinfo_to_sql.1 (+2/-2) man/mysql_upgrade.1 (+3/-3) man/mysql_waitpid.1 (+2/-2) man/mysql_zap.1 (+2/-2) man/mysqlaccess.1 (+2/-2) man/mysqladmin.1 (+4/-4) man/mysqlbinlog.1 (+5/-12) man/mysqlbug.1 (+2/-2) man/mysqlcheck.1 (+4/-4) man/mysqld.8 (+2/-2) man/mysqld_multi.1 (+2/-2) man/mysqld_safe.1 (+19/-17) man/mysqldump.1 (+6/-7) man/mysqldumpslow.1 (+2/-2) man/mysqlhotcopy.1 (+3/-3) man/mysqlimport.1 (+4/-4) man/mysqlshow.1 (+4/-4) man/mysqlslap.1 (+4/-4) man/mysqltest.1 (+2/-2) man/ndb-common-options.1 (+3/-27) man/ndb_blob_tool.1 (+3/-15) man/ndb_config.1 (+4/-40) man/ndb_cpcd.1 (+2/-2) man/ndb_delete_all.1 (+3/-3) man/ndb_desc.1 (+3/-3) man/ndb_drop_index.1 (+4/-4) man/ndb_drop_table.1 (+3/-3) man/ndb_error_reporter.1 (+3/-3) man/ndb_index_stat.1 (+3/-15) man/ndb_mgm.1 (+3/-15) man/ndb_mgmd.8 (+4/-40) man/ndb_print_backup_file.1 (+2/-2) man/ndb_print_schema_file.1 (+4/-4) man/ndb_print_sys_file.1 (+4/-4) man/ndb_restore.1 (+5/-17) man/ndb_select_all.1 (+3/-3) man/ndb_select_count.1 (+3/-3) man/ndb_setup.py.1 (+3/-63) man/ndb_show_tables.1 (+3/-3) man/ndb_size.pl.1 (+3/-3) man/ndb_waiter.1 (+3/-3) man/ndbd.8 (+3/-15) man/ndbd_redo_log_reader.1 (+5/-5) man/ndbinfo_select_all.1 (+3/-9) 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_mts_execute_partial_trx_in_relay_log.inc (+36/-0) mysql-test/include/have_handler_socket.inc (+15/-0) mysql-test/include/have_util_nc.inc (+53/-0) mysql-test/include/mysqlhotcopy.inc (+1/-1) mysql-test/include/plugin.defs (+2/-1) mysql-test/include/subquery_mat.inc (+47/-0) mysql-test/mysql-test-run.pl (+54/-27) mysql-test/r/bug1294190.result (+12/-0) mysql-test/r/bug57430.result (+14/-0) mysql-test/r/connect.result (+6/-0) mysql-test/r/ctype_binary.result (+7/-0) mysql-test/r/ctype_cp1251.result (+7/-0) mysql-test/r/ctype_latin1.result (+7/-0) mysql-test/r/ctype_ucs.result (+7/-0) mysql-test/r/ctype_utf8.result (+7/-0) mysql-test/r/func_crypt.result (+23/-0) mysql-test/r/grant.result (+13/-0) mysql-test/r/grant_cache.result (+2/-0) mysql-test/r/handler_socket.result (+4/-0) mysql-test/r/information_schema-big.result (+20/-0) mysql-test/r/innodb_recovery_with_upper_case_names.result (+48/-0) mysql-test/r/lock_sync.result (+51/-0) mysql-test/r/mysql_upgrade.result (+1/-0) mysql-test/r/mysqlbinlog_mixed_or_statment.result (+26/-0) mysql-test/r/mysqld--help-notwin.result (+17/-1) mysql-test/r/mysqld--help-win.result (+8/-1) mysql-test/r/openssl_1.result (+2/-2) mysql-test/r/partition_innodb.result (+112/-0) mysql-test/r/percona_bug1354988.result (+50/-0) mysql-test/r/percona_bug1384568.result (+9/-0) mysql-test/r/percona_bug1405076.result (+23/-0) mysql-test/r/percona_log_slow_sp_statements.result (+46/-10) mysql-test/r/percona_statement_set.result (+29/-2) mysql-test/r/set_statement_and_max_statement_time.result (+7/-0) mysql-test/r/ssl.result (+2/-2) mysql-test/r/subquery_mat.result (+53/-0) mysql-test/r/subquery_mat_all.result (+53/-0) mysql-test/r/subquery_mat_none.result (+53/-0) mysql-test/r/temporal_literal.result (+40/-0) mysql-test/r/variables-big.result (+10/-10) mysql-test/r/windows.result (+5/-0) mysql-test/std_data/cacert.pem (+77/-15) mysql-test/std_data/client-cert.pem (+73/-37) mysql-test/std_data/client-key.pem (+25/-13) mysql-test/std_data/server-cert.pem (+73/-32) mysql-test/std_data/server-key.pem (+25/-7) mysql-test/std_data/server8k-cert.pem (+205/-49) mysql-test/std_data/server8k-key.pem (+97/-97) mysql-test/suite/binlog/r/binlog_error_action.result (+4/-4) mysql-test/suite/binlog/r/binlog_switch_inside_trans.result (+1/-7) mysql-test/suite/binlog/t/binlog_error_action.test (+5/-5) mysql-test/suite/binlog/t/binlog_grant.test (+1/-1) mysql-test/suite/binlog/t/binlog_switch_inside_trans.test (+1/-5) mysql-test/suite/engines/funcs/r/in_insert_select_unique_violation.result (+11/-11) mysql-test/suite/engines/funcs/t/in_insert_select_unique_violation.test (+11/-11) mysql-test/suite/engines/iuds/r/insert_number.result (+1/-1) mysql-test/suite/engines/iuds/t/insert_number.test (+1/-0) mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result (+4/-0) mysql-test/suite/innodb/include/checksum_not_strict.inc (+5/-0) mysql-test/suite/innodb/r/add_foreign_key.result (+0/-31) mysql-test/suite/innodb/r/blob_redo.result (+42/-0) mysql-test/suite/innodb/r/bug68116.result (+17/-0) mysql-test/suite/innodb/r/checksum.result (+12/-0) mysql-test/suite/innodb/r/innodb-alter.result (+48/-0) mysql-test/suite/innodb/r/innodb_corrupt_bit.result (+0/-81) mysql-test/suite/innodb/r/insert_debug.result (+11/-0) mysql-test/suite/innodb/r/sp_temp_table.result (+253/-0) mysql-test/suite/innodb/r/strict_mode.result (+242/-0) mysql-test/suite/innodb/t/add_foreign_key.test (+0/-38) mysql-test/suite/innodb/t/blob_redo-master.opt (+1/-0) mysql-test/suite/innodb/t/blob_redo.test (+92/-0) mysql-test/suite/innodb/t/bug68116.test (+63/-0) mysql-test/suite/innodb/t/checksum.test (+15/-0) mysql-test/suite/innodb/t/innodb-alter.test (+16/-0) mysql-test/suite/innodb/t/innodb_corrupt_bit.test (+0/-126) mysql-test/suite/innodb/t/insert_debug.test (+16/-0) mysql-test/suite/innodb/t/sp_temp_table.test (+103/-0) mysql-test/suite/innodb/t/strict_mode.test (+249/-0) mysql-test/suite/innodb_fts/r/fts_compatibility.result (+262/-0) mysql-test/suite/innodb_fts/r/fts_compatibility_win.result (+262/-0) mysql-test/suite/innodb_fts/t/fts_compatibility.test (+266/-0) mysql-test/suite/innodb_fts/t/fts_compatibility_win.test (+263/-0) mysql-test/suite/perfschema/r/unary_digest.result (+47/-0) mysql-test/suite/perfschema/t/unary_digest.test (+98/-0) mysql-test/suite/rpl/r/rpl_colSize.result (+14/-0) mysql-test/suite/rpl/r/rpl_gtid_binary_log_as_relay_log.result (+23/-0) mysql-test/suite/rpl/r/rpl_gtid_deployment_step.result (+188/-0) mysql-test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result (+17/-0) mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_off.result (+26/-0) mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result (+26/-0) mysql-test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result (+28/-0) mysql-test/suite/rpl/r/rpl_recovery_empty_sqlthd_pos.result (+25/-0) mysql-test/suite/rpl/r/rpl_recovery_replicate_same_server_id.result (+26/-0) mysql-test/suite/rpl/t/rpl_colSize.test (+49/-2) mysql-test/suite/rpl/t/rpl_gtid_binary_log_as_relay_log.test (+57/-0) mysql-test/suite/rpl/t/rpl_gtid_deployment_step.test (+193/-0) mysql-test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test (+59/-0) mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off-slave.opt (+1/-0) mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test (+21/-0) mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on-slave.opt (+1/-0) mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on.test (+21/-0) mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx-slave.opt (+1/-0) mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test (+77/-0) mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos-slave.opt (+1/-0) mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos.test (+64/-0) mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id-slave.opt (+1/-0) mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test (+84/-0) mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test (+13/-1) mysql-test/suite/sys_vars/r/binlog_error_action_basic.result (+45/-0) mysql-test/suite/sys_vars/r/binlogging_impossible_mode_basic.result (+22/-0) mysql-test/suite/sys_vars/r/gtid_deployment_step_basic.result (+28/-0) mysql-test/suite/sys_vars/r/secure_auth_func.result (+2/-0) mysql-test/suite/sys_vars/r/sql_log_bin_basic.result (+6/-1) mysql-test/suite/sys_vars/t/binlog_error_action_basic.test (+69/-0) mysql-test/suite/sys_vars/t/gtid_deployment_step_basic.test (+25/-0) mysql-test/suite/sys_vars/t/sql_log_bin_basic.test (+5/-1) mysql-test/t/bug1294190.test (+34/-0) mysql-test/t/bug57430.test (+13/-0) mysql-test/t/dynamic_tracing.test (+1/-1) mysql-test/t/file_contents.test (+10/-2) mysql-test/t/handler_socket-master.opt (+1/-0) mysql-test/t/handler_socket.test (+14/-0) mysql-test/t/innodb_recovery_with_upper_case_names-master.opt (+1/-0) mysql-test/t/innodb_recovery_with_upper_case_names.test (+63/-0) mysql-test/t/lock_sync.test (+56/-0) mysql-test/t/mysqlbinlog_mixed_or_statment.test (+44/-0) mysql-test/t/openssl_1.test (+2/-2) mysql-test/t/partition_innodb.test (+127/-0) mysql-test/t/percona_bug1354988.test (+53/-0) mysql-test/t/percona_bug1384568.test (+13/-0) mysql-test/t/percona_bug1405076.test (+54/-0) mysql-test/t/percona_log_slow_sp_statements.test (+33/-5) mysql-test/t/percona_statement_set.test (+48/-2) mysql-test/t/set_statement_and_max_statement_time.test (+14/-0) mysql-test/t/temporal_literal.test (+28/-0) mysql-test/t/windows.test (+16/-0) mysql-test/valgrind.supp (+28/-1) mysys/lf_alloc-pin.c (+10/-1) mysys/my_sync.c (+6/-2) mysys/my_thr_init.c (+28/-2) mysys/my_wincond.c (+1/-23) mysys/ptr_cmp.c (+14/-1) packaging/rpm-fedora/mysql-systemd-start (+19/-3) packaging/rpm-fedora/mysql.spec.in (+90/-76) packaging/rpm-oel/mysql-systemd-start (+19/-3) packaging/rpm-oel/mysql.init (+6/-2) packaging/rpm-oel/mysql.spec.in (+18/-9) packaging/rpm-sles/CMakeLists.txt (+28/-0) packaging/rpm-sles/filter-provides.sh (+6/-0) packaging/rpm-sles/filter-requires.sh (+6/-0) packaging/rpm-sles/my.cnf (+31/-0) packaging/rpm-sles/my_config.h (+30/-0) packaging/rpm-sles/mysql-systemd-start (+66/-0) packaging/rpm-sles/mysql.conf (+1/-0) packaging/rpm-sles/mysql.init (+236/-0) packaging/rpm-sles/mysql.spec.in (+1660/-0) packaging/rpm-sles/mysqld.service (+48/-0) percona-xtradb-cluster-tests/conf/conf22.cnf-node1 (+12/-0) percona-xtradb-cluster-tests/conf/conf22.cnf-node2 (+11/-0) percona-xtradb-cluster-tests/conf/conf23.cnf-node1 (+18/-0) percona-xtradb-cluster-tests/conf/conf23.cnf-node2 (+17/-0) percona-xtradb-cluster-tests/conf/conf24.cnf-node1 (+17/-0) percona-xtradb-cluster-tests/conf/conf24.cnf-node2 (+11/-0) percona-xtradb-cluster-tests/inc/common.sh (+39/-0) percona-xtradb-cluster-tests/run.sh (+4/-1) percona-xtradb-cluster-tests/t/xb_galera_sst_advanced-v2.sh (+8/-0) percona-xtradb-cluster-tests/t/xb_galera_sst_dirs.sh (+8/-0) percona-xtradb-cluster-tests/t/xb_galera_sst_encrypted.sh (+7/-0) plugin/HandlerSocket-Plugin-for-MySQL/handlersocket/database.cpp (+7/-0) plugin/auth/CMakeLists.txt (+3/-1) plugin/query_response_time/plugin.cc (+60/-2) plugin/query_response_time/query_response_time.cc (+45/-24) plugin/query_response_time/query_response_time.h (+8/-1) plugin/query_response_time/tests/mtr/basic.result (+12/-0) plugin/query_response_time/tests/mtr/query_response_time-rw-begin.inc (+16/-0) plugin/query_response_time/tests/mtr/query_response_time-rw-end.inc (+10/-0) plugin/query_response_time/tests/mtr/query_response_time-rw.result (+765/-0) plugin/query_response_time/tests/mtr/query_response_time-rw.test (+201/-0) scripts/CMakeLists.txt (+4/-13) scripts/mysql_install_db.pl.in (+6/-6) scripts/mysql_setpermission.sh (+3/-3) scripts/mysqld_safe.sh (+59/-0) scripts/ps_tokudb_admin.sh (+265/-0) scripts/wsrep_sst_xtrabackup-v2.sh (+7/-7) sql-common/client.c (+2/-2) sql/binlog.cc (+38/-7) sql/field.cc (+27/-30) sql/field.h (+1/-2) sql/ha_partition.cc (+55/-0) sql/handler.cc (+1/-1) sql/handler.h (+4/-2) sql/item.cc (+19/-3) sql/item_func.cc (+4/-1) sql/item_timefunc.h (+3/-0) sql/log.cc (+10/-1) sql/log_event.cc (+46/-27) sql/log_event.h (+15/-16) sql/mdl.cc (+17/-2) sql/mysqld.cc (+7/-2) sql/mysqld.h (+6/-3) sql/rpl_master.cc (+59/-0) sql/rpl_rli.cc (+0/-4) sql/rpl_rli.h (+0/-10) sql/rpl_slave.cc (+233/-11) sql/rpl_utility.cc (+6/-19) sql/rpl_utility.h (+2/-10) sql/sp_instr.cc (+12/-2) sql/sp_instr.h (+0/-2) sql/sql_acl.cc (+5/-3) sql/sql_base.cc (+27/-8) sql/sql_parse.cc (+186/-5) sql/sql_parse.h (+3/-0) sql/sql_select.cc (+3/-1) sql/sql_show.cc (+7/-5) sql/sql_table.cc (+28/-2) sql/sql_tmp_table.cc (+4/-13) sql/sql_tmp_table.h (+1/-2) sql/sql_yacc.yy (+2/-0) sql/string_service.cc (+3/-6) sql/sys_vars.cc (+95/-14) sql/table.cc (+3/-0) sql/wsrep_mysqld.cc (+30/-10) storage/innobase/btr/btr0cur.cc (+40/-31) storage/innobase/buf/buf0buf.cc (+21/-14) storage/innobase/buf/buf0flu.cc (+20/-22) storage/innobase/buf/buf0lru.cc (+1/-1) storage/innobase/buf/buf0rea.cc (+5/-3) storage/innobase/dict/dict0dict.cc (+23/-6) storage/innobase/fil/fil0fil.cc (+20/-6) storage/innobase/fts/fts0fts.cc (+512/-168) storage/innobase/fts/fts0opt.cc (+14/-4) storage/innobase/handler/ha_innodb.cc (+51/-3) storage/innobase/handler/handler0alter.cc (+1/-8) storage/innobase/handler/i_s.cc (+0/-5) storage/innobase/ibuf/ibuf0ibuf.cc (+2/-2) storage/innobase/include/btr0cur.ic (+2/-2) storage/innobase/include/buf0buf.h (+4/-1) storage/innobase/include/buf0flu.h (+2/-2) storage/innobase/include/dict0dict.h (+1/-1) storage/innobase/include/fil0fil.h (+3/-1) storage/innobase/include/fts0priv.ic (+23/-3) storage/innobase/include/sync0sync.h (+0/-1) storage/innobase/include/univ.i (+5/-1) storage/innobase/lock/lock0lock.cc (+29/-11) storage/innobase/log/log0log.cc (+12/-6) storage/innobase/log/log0recv.cc (+2/-1) storage/innobase/os/os0thread.cc (+3/-0) storage/innobase/page/page0zip.cc (+10/-3) storage/innobase/row/row0mysql.cc (+6/-2) storage/innobase/srv/srv0srv.cc (+0/-9) storage/innobase/srv/srv0start.cc (+19/-8) storage/innobase/sync/sync0rw.cc (+1/-0) storage/perfschema/gen_pfs_lex_token.cc (+91/-5) storage/perfschema/pfs_digest.cc (+55/-4) support-files/mysql.spec.sh (+32/-14) unittest/gunit/CMakeLists.txt (+11/-4) win/create_def_file.js (+1/-0) Text conflict in percona-xtradb-cluster-tests/inc/common.sh |
To merge this branch: | bzr merge lp://qastaging/~percona-core/percona-xtradb-cluster/pxc-5.6.22 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Percona core | Pending | ||
Review via email:
|
Description of the change
This is the release branch for 5.6.22 PXC release corresponding to milestone: https:/
It has following:
a) PS 5.6 merged upto revno 743.
b) https:/
c) Tests for PXC 2.2.9's --no-backup-locks option.
d) Version bumped.
Unmerged revisions
- 979. By Raghavendra D Prabhu
-
Add mysql in Provides as in PS client package
- 978. By Raghavendra D Prabhu
-
Bug#1402338 Restrict wsrep_replicate
_myisam to CREATE TABLE - 977. By Raghavendra D Prabhu
-
Bug#1380697 Remove the TERM and fix the jpid case
- 976. By Raghavendra D Prabhu
-
Bug#1380697 Move the TERM group kill to signal case
- 975. By Raghavendra D Prabhu
-
Bug#1402338 Fix return from wsrep_to_
isolation_ begin - 974. By Raghavendra D Prabhu
-
Bug#1402338 Fix build error
- 973. By Raghavendra D Prabhu
-
Bug#1402338 Refactor code for table_list and table separately.
Due to the nature of WSREP_TO_
ISOLATION_ BEGIN interface, it is possible to have following combinations: (database, table, table_list)
a) NULL, NULL, XYZ
b) XYZ, ABC, NULL
c) ABC, NULL, NULL
Only a) and b) matter here since we are filtering on tables only here.
In case of a), if any table in the list is myisam, the whole DDL is
skipped. This may not work with mixed (DDL and DML) statements like
CREATE TABLE AS SELECT (CTAS), however CTAS is handled without TOI in
WSREP, so should be fine for now. - 972. By Raghavendra D Prabhu
-
Add more logging in tests
- 971. By Raghavendra D Prabhu
-
Add more logging in tests for run_cmd and its variants
- 970. By Raghavendra D Prabhu
-
Allow for overriding of backup locks with environment variable FORCE_FTWRL
e) Added DMYSQL_ MAINTAINER_ MODE=OFF to fix build errors, this is being fixed upstream (PS) currently.