Merge lp://qastaging/~akopytov/percona-xtrabackup/rebase-2.3-on-mysql-5.6.22 into lp://qastaging/percona-xtrabackup/2.3

Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 5058
Proposed branch: lp://qastaging/~akopytov/percona-xtrabackup/rebase-2.3-on-mysql-5.6.22
Merge into: lp://qastaging/percona-xtrabackup/2.3
Diff against target: 16665 lines (+11492/-1140)
188 files modified
.gitignore (+3139/-0)
CMakeLists.txt (+48/-46)
VERSION (+1/-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)
mysql-test/extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc (+36/-0)
mysql-test/include/have_util_nc.inc (+53/-0)
mysql-test/include/subquery_mat.inc (+47/-0)
mysql-test/mysql-test-run.pl (+76/-12)
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/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 (+8/-1)
mysql-test/r/mysqld--help-win.result (+8/-1)
mysql-test/r/partition_innodb.result (+112/-0)
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/windows.result (+5/-0)
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/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/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/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_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_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/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/sql_log_bin_basic.test (+5/-1)
mysql-test/t/dynamic_tracing.test (+1/-1)
mysql-test/t/file_contents.test (+10/-2)
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/partition_innodb.test (+127/-0)
mysql-test/t/temporal_literal.test (+28/-0)
mysql-test/t/windows.test (+16/-0)
mysql-test/valgrind.supp (+29/-1)
mysys/my_sync.c (+6/-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)
plugin/auth/CMakeLists.txt (+3/-1)
scripts/CMakeLists.txt (+4/-13)
scripts/mysql_config.sh (+1/-1)
scripts/mysql_install_db.pl.in (+6/-6)
scripts/mysql_setpermission.sh (+3/-3)
sql-common/client.c (+2/-2)
sql/binlog.cc (+6/-3)
sql/field.cc (+27/-30)
sql/field.h (+1/-2)
sql/ha_partition.cc (+55/-0)
sql/handler.h (+2/-0)
sql/item.cc (+19/-3)
sql/item_func.cc (+15/-8)
sql/item_timefunc.h (+3/-0)
sql/log.cc (+1/-1)
sql/log_event.cc (+46/-30)
sql/log_event.h (+15/-16)
sql/mysqld.cc (+5/-2)
sql/mysqld.h (+4/-3)
sql/rpl_master.cc (+35/-0)
sql/rpl_slave.cc (+230/-9)
sql/rpl_utility.cc (+6/-19)
sql/rpl_utility.h (+2/-10)
sql/sql_base.cc (+31/-11)
sql/sql_parse.cc (+116/-1)
sql/sql_parse.h (+3/-0)
sql/sql_table.cc (+26/-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 (+29/-14)
storage/innobase/btr/btr0cur.cc (+40/-31)
storage/innobase/buf/buf0buf.cc (+6/-1)
storage/innobase/buf/buf0flu.cc (+16/-20)
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 (+52/-2)
storage/innobase/handler/handler0alter.cc (+1/-8)
storage/innobase/ibuf/ibuf0ibuf.cc (+2/-2)
storage/innobase/include/btr0cur.ic (+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/lock/lock0lock.cc (+24/-7)
storage/innobase/log/log0log.cc (+6/-2)
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/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)
To merge this branch: bzr merge lp://qastaging/~akopytov/percona-xtrabackup/rebase-2.3-on-mysql-5.6.22
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+245421@code.qastaging.launchpad.net

Description of the change

http://jenkins.percona.com/view/PXB 2.3/job/percona-xtrabackup-2.3-param/18/

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: