lp:~laurynas-biveinis/percona-server/merge-5.6.14
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.
- Stewart Smith (community): Approve
-
Diff: 23449 lines (+7247/-4994)301 files modifiedMakefile (+2/-2)
Percona-Server/VERSION (+1/-1)
Percona-Server/client/mysqltest.cc (+1/-0)
Percona-Server/cmake/os/WindowsCache.cmake (+1/-0)
Percona-Server/config.h.cmake (+1/-0)
Percona-Server/configure.cmake (+1/-0)
Percona-Server/include/my_pthread.h (+10/-1)
Percona-Server/include/mysql/plugin_audit.h (+5/-1)
Percona-Server/include/mysql/plugin_audit.h.pp (+4/-0)
Percona-Server/libmysql/CMakeLists.txt (+7/-0)
Percona-Server/libmysql/libmysql.def (+7/-0)
Percona-Server/libmysqld/lib_sql.cc (+7/-6)
Percona-Server/man/comp_err.1 (+7/-36)
Percona-Server/man/innochecksum.1 (+7/-36)
Percona-Server/man/msql2mysql.1 (+7/-36)
Percona-Server/man/my_print_defaults.1 (+7/-36)
Percona-Server/man/myisam_ftdump.1 (+7/-36)
Percona-Server/man/myisamchk.1 (+7/-36)
Percona-Server/man/myisamlog.1 (+7/-36)
Percona-Server/man/myisampack.1 (+7/-36)
Percona-Server/man/mysql-stress-test.pl.1 (+7/-37)
Percona-Server/man/mysql-test-run.pl.1 (+7/-37)
Percona-Server/man/mysql.1 (+26/-40)
Percona-Server/man/mysql.server.1 (+7/-36)
Percona-Server/man/mysql_client_test.1 (+7/-37)
Percona-Server/man/mysql_client_test_embedded.1 (+1/-1)
Percona-Server/man/mysql_config.1 (+7/-36)
Percona-Server/man/mysql_config_editor.1 (+7/-36)
Percona-Server/man/mysql_convert_table_format.1 (+7/-36)
Percona-Server/man/mysql_find_rows.1 (+7/-36)
Percona-Server/man/mysql_fix_extensions.1 (+7/-36)
Percona-Server/man/mysql_install_db.1 (+7/-36)
Percona-Server/man/mysql_plugin.1 (+7/-36)
Percona-Server/man/mysql_secure_installation.1 (+7/-39)
Percona-Server/man/mysql_setpermission.1 (+7/-36)
Percona-Server/man/mysql_tzinfo_to_sql.1 (+7/-36)
Percona-Server/man/mysql_upgrade.1 (+9/-38)
Percona-Server/man/mysql_waitpid.1 (+7/-36)
Percona-Server/man/mysql_zap.1 (+7/-36)
Percona-Server/man/mysqlaccess.1 (+7/-36)
Percona-Server/man/mysqladmin.1 (+8/-37)
Percona-Server/man/mysqlbinlog.1 (+21/-50)
Percona-Server/man/mysqlbug.1 (+7/-36)
Percona-Server/man/mysqlcheck.1 (+7/-36)
Percona-Server/man/mysqld.8 (+7/-36)
Percona-Server/man/mysqld_multi.1 (+7/-36)
Percona-Server/man/mysqld_safe.1 (+7/-36)
Percona-Server/man/mysqldump.1 (+16/-50)
Percona-Server/man/mysqldumpslow.1 (+7/-36)
Percona-Server/man/mysqlhotcopy.1 (+8/-39)
Percona-Server/man/mysqlimport.1 (+7/-36)
Percona-Server/man/mysqlshow.1 (+7/-36)
Percona-Server/man/mysqlslap.1 (+8/-37)
Percona-Server/man/mysqltest.1 (+7/-37)
Percona-Server/man/mysqltest_embedded.1 (+1/-1)
Percona-Server/man/ndb-common-options.1 (+23/-47)
Percona-Server/man/ndb_blob_tool.1 (+499/-0)
Percona-Server/man/ndb_config.1 (+35/-56)
Percona-Server/man/ndb_cpcd.1 (+7/-36)
Percona-Server/man/ndb_delete_all.1 (+8/-37)
Percona-Server/man/ndb_desc.1 (+8/-37)
Percona-Server/man/ndb_drop_index.1 (+9/-38)
Percona-Server/man/ndb_drop_table.1 (+8/-37)
Percona-Server/man/ndb_error_reporter.1 (+9/-38)
Percona-Server/man/ndb_index_stat.1 (+24/-51)
Percona-Server/man/ndb_mgm.1 (+10/-37)
Percona-Server/man/ndb_mgmd.8 (+49/-62)
Percona-Server/man/ndb_print_backup_file.1 (+7/-36)
Percona-Server/man/ndb_print_schema_file.1 (+7/-36)
Percona-Server/man/ndb_print_sys_file.1 (+7/-36)
Percona-Server/man/ndb_restore.1 (+24/-51)
Percona-Server/man/ndb_select_all.1 (+8/-37)
Percona-Server/man/ndb_select_count.1 (+8/-37)
Percona-Server/man/ndb_setup.py.1 (+776/-0)
Percona-Server/man/ndb_show_tables.1 (+8/-37)
Percona-Server/man/ndb_size.pl.1 (+8/-37)
Percona-Server/man/ndb_waiter.1 (+9/-38)
Percona-Server/man/ndbd.8 (+22/-49)
Percona-Server/man/ndbd_redo_log_reader.1 (+10/-39)
Percona-Server/man/ndbinfo_select_all.1 (+11/-40)
Percona-Server/man/ndbmtd.8 (+7/-36)
Percona-Server/man/perror.1 (+7/-36)
Percona-Server/man/replace.1 (+7/-36)
Percona-Server/man/resolve_stack_dump.1 (+10/-36)
Percona-Server/man/resolveip.1 (+7/-36)
Percona-Server/mysql-test/collections/default.daily (+3/-3)
Percona-Server/mysql-test/collections/default.daily-valgrind (+3/-3)
Percona-Server/mysql-test/collections/default.experimental (+0/-2)
Percona-Server/mysql-test/collections/default.push (+3/-3)
Percona-Server/mysql-test/collections/default.release.in (+1/-1)
Percona-Server/mysql-test/collections/default.weekly (+12/-14)
Percona-Server/mysql-test/collections/default.weekly-valgrind (+1/-1)
Percona-Server/mysql-test/extra/rpl_tests/rpl_stress_test.inc (+4/-20)
Percona-Server/mysql-test/include/handler.inc (+2/-3)
Percona-Server/mysql-test/include/have_plugin_auth.inc (+4/-5)
Percona-Server/mysql-test/include/have_plugin_interface.inc (+4/-5)
Percona-Server/mysql-test/include/have_plugin_server.inc (+4/-5)
Percona-Server/mysql-test/include/have_valgrind.inc (+11/-0)
Percona-Server/mysql-test/include/rpl_stop_server.inc (+2/-2)
Percona-Server/mysql-test/lib/v1/mysql-test-run.pl (+1/-1)
Percona-Server/mysql-test/r/change_user_notembedded.result (+1/-1)
Percona-Server/mysql-test/r/failed_auth_3909.result (+1/-1)
Percona-Server/mysql-test/r/handler_innodb.result (+8/-3)
Percona-Server/mysql-test/r/handler_myisam.result (+8/-3)
Percona-Server/mysql-test/r/log_tables.result (+1/-1)
Percona-Server/mysql-test/r/mdl_sync.result (+5/-25)
Percona-Server/mysql-test/r/plugin_auth.result (+1/-3)
Percona-Server/mysql-test/r/plugin_auth_qa_2.result (+4/-22)
Percona-Server/mysql-test/r/rewrite_general_log.result (+3/-0)
Percona-Server/mysql-test/suite/auth_sec/r/server_withoutssl_client_withoutssl.result (+8/-16)
Percona-Server/mysql-test/suite/auth_sec/r/server_withoutssl_client_withssl.result (+8/-0)
Percona-Server/mysql-test/suite/auth_sec/t/server_withoutssl_client_withoutssl.test (+6/-2)
Percona-Server/mysql-test/suite/auth_sec/t/server_withoutssl_client_withssl.test (+3/-3)
Percona-Server/mysql-test/suite/binlog/r/binlog_database.result (+1/-1)
Percona-Server/mysql-test/suite/binlog/r/binlog_index.result (+3/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_innodb_row.result (+1/-1)
Percona-Server/mysql-test/suite/binlog/r/binlog_max_extension.result (+3/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_row_binlog.result (+2/-2)
Percona-Server/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result (+6/-6)
Percona-Server/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result (+1/-1)
Percona-Server/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result (+5/-5)
Percona-Server/mysql-test/suite/binlog/t/binlog_index.test (+3/-0)
Percona-Server/mysql-test/suite/binlog/t/binlog_max_extension.test (+3/-2)
Percona-Server/mysql-test/suite/innodb_fts/r/fulltext.result (+1/-2)
Percona-Server/mysql-test/suite/innodb_fts/r/fulltext_var.result (+0/-3)
Percona-Server/mysql-test/suite/innodb_fts/r/innodb-fts-basic.result (+3/-0)
Percona-Server/mysql-test/suite/innodb_fts/r/innodb-fts-stopword.result (+0/-4)
Percona-Server/mysql-test/suite/innodb_fts/r/innodb_fts_misc.result (+2/-4)
Percona-Server/mysql-test/suite/innodb_fts/r/innodb_fts_misc_1.result (+36/-0)
Percona-Server/mysql-test/suite/innodb_fts/r/innodb_fts_proximity.result (+0/-1)
Percona-Server/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test (+1/-1)
Percona-Server/mysql-test/suite/perfschema/include/event_aggregate_setup.inc (+1/-1)
Percona-Server/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result (+215/-5)
Percona-Server/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result (+215/-5)
Percona-Server/mysql-test/suite/perfschema/t/hostcache_ipv4_blocked.test (+75/-6)
Percona-Server/mysql-test/suite/perfschema/t/hostcache_ipv6_blocked.test (+75/-6)
Percona-Server/mysql-test/suite/perfschema/t/nesting.test (+1/-1)
Percona-Server/mysql-test/suite/rpl/r/rpl_group_commit_deadlock.result (+3/-13)
Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result (+28/-28)
Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result (+1/-1)
Percona-Server/mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result (+12/-12)
Percona-Server/mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result (+12/-12)
Percona-Server/mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result (+12/-12)
Percona-Server/mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result (+12/-12)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop.result (+2/-2)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result (+138/-138)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result (+1/-1)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_mixing_engines.result (+12/-12)
Percona-Server/mysql-test/suite/rpl/r/rpl_semi_sync_group_commit_deadlock.result (+3/-13)
Percona-Server/mysql-test/suite/rpl/r/rpl_semi_sync_non_group_commit_deadlock.result (+3/-13)
Percona-Server/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result (+28/-28)
Percona-Server/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result (+1/-1)
Percona-Server/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result (+12/-12)
Percona-Server/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result (+3/-3)
Percona-Server/mysql-test/suite/rpl/t/rpl_binlog_errors.test (+3/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_group_commit_deadlock.test (+4/-19)
Percona-Server/mysql-test/suite/rpl/t/rpl_gtid_sql_until_before_after.test (+10/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock.test (+4/-19)
Percona-Server/mysql-test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock.test (+4/-19)
Percona-Server/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result (+2/-8)
Percona-Server/mysql-test/suite/sys_vars/t/rpl_init_slave_func.test (+6/-4)
Percona-Server/mysql-test/t/change_user_notembedded.test (+9/-8)
Percona-Server/mysql-test/t/failed_auth_3909.test (+2/-1)
Percona-Server/mysql-test/t/mdl_sync.test (+5/-51)
Percona-Server/mysql-test/t/plugin_auth.test (+1/-1)
Percona-Server/mysql-test/t/plugin_auth_qa_2.test (+4/-4)
Percona-Server/mysql-test/t/rewrite_general_log.test (+3/-0)
Percona-Server/mysys/my_winthread.c (+4/-2)
Percona-Server/mysys_ssl/my_aes.cc (+15/-6)
Percona-Server/mysys_ssl/my_rnd.cc (+19/-8)
Percona-Server/packaging/rpm-uln/CMakeLists.txt (+1/-1)
Percona-Server/packaging/rpm-uln/mysql-5.6-stack-guard.patch (+0/-143)
Percona-Server/packaging/rpm-uln/mysql.spec.sh (+7/-2)
Percona-Server/plugin/innodb_memcached/innodb_memcache/include/handler_api.h (+14/-2)
Percona-Server/plugin/innodb_memcached/innodb_memcache/include/innodb_cb_api.h (+93/-20)
Percona-Server/plugin/innodb_memcached/innodb_memcache/src/handler_api.cc (+29/-0)
Percona-Server/plugin/innodb_memcached/innodb_memcache/src/innodb_api.c (+423/-131)
Percona-Server/plugin/innodb_memcached/innodb_memcache/src/innodb_config.c (+63/-5)
Percona-Server/plugin/innodb_memcached/innodb_memcache/src/innodb_engine.c (+24/-7)
Percona-Server/scripts/mysqld_safe.sh (+1/-1)
Percona-Server/sql-common/client.c (+6/-0)
Percona-Server/sql-common/client_authentication.cc (+4/-0)
Percona-Server/sql/binlog.cc (+111/-37)
Percona-Server/sql/event_db_repository.cc (+16/-1)
Percona-Server/sql/event_scheduler.cc (+51/-35)
Percona-Server/sql/event_scheduler.h (+1/-1)
Percona-Server/sql/events.cc (+4/-3)
Percona-Server/sql/events.h (+1/-1)
Percona-Server/sql/ha_ndbcluster_binlog.cc (+7/-1)
Percona-Server/sql/ha_partition.cc (+2/-1)
Percona-Server/sql/handler.cc (+8/-3)
Percona-Server/sql/hostname.cc (+3/-3)
Percona-Server/sql/item.h (+2/-1)
Percona-Server/sql/item_subselect.cc (+21/-1)
Percona-Server/sql/log.cc (+13/-6)
Percona-Server/sql/log_event.cc (+11/-1)
Percona-Server/sql/log_event_old.cc (+3/-0)
Percona-Server/sql/mysqld.cc (+170/-68)
Percona-Server/sql/mysqld.h (+1/-0)
Percona-Server/sql/net_serv.cc (+1/-1)
Percona-Server/sql/partition_info.cc (+2/-3)
Percona-Server/sql/rpl_info_factory.cc (+28/-8)
Percona-Server/sql/rpl_info_table.cc (+11/-7)
Percona-Server/sql/rpl_info_table_access.h (+1/-1)
Percona-Server/sql/rpl_record.cc (+5/-2)
Percona-Server/sql/rpl_rli.cc (+31/-36)
Percona-Server/sql/rpl_rli.h (+1/-7)
Percona-Server/sql/rpl_slave.cc (+87/-6)
Percona-Server/sql/rpl_utility.cc (+13/-5)
Percona-Server/sql/set_var.cc (+2/-2)
Percona-Server/sql/share/errmsg-utf8.txt (+4/-1)
Percona-Server/sql/sp.cc (+8/-1)
Percona-Server/sql/sp_head.cc (+13/-5)
Percona-Server/sql/sp_instr.cc (+32/-16)
Percona-Server/sql/sp_instr.h (+20/-2)
Percona-Server/sql/sp_rcontext.cc (+81/-37)
Percona-Server/sql/sp_rcontext.h (+29/-17)
Percona-Server/sql/sql_acl.cc (+114/-38)
Percona-Server/sql/sql_admin.cc (+14/-2)
Percona-Server/sql/sql_audit.cc (+5/-1)
Percona-Server/sql/sql_audit.h (+57/-21)
Percona-Server/sql/sql_base.cc (+18/-18)
Percona-Server/sql/sql_base.h (+4/-2)
Percona-Server/sql/sql_cache.cc (+6/-1)
Percona-Server/sql/sql_class.cc (+147/-47)
Percona-Server/sql/sql_class.h (+182/-63)
Percona-Server/sql/sql_connect.cc (+39/-30)
Percona-Server/sql/sql_db.cc (+8/-5)
Percona-Server/sql/sql_handler.cc (+3/-0)
Percona-Server/sql/sql_insert.cc (+3/-2)
Percona-Server/sql/sql_lex.cc (+80/-6)
Percona-Server/sql/sql_lex.h (+11/-0)
Percona-Server/sql/sql_manager.cc (+6/-3)
Percona-Server/sql/sql_optimizer.cc (+120/-69)
Percona-Server/sql/sql_optimizer.h (+6/-14)
Percona-Server/sql/sql_parse.cc (+45/-14)
Percona-Server/sql/sql_partition.cc (+1/-0)
Percona-Server/sql/sql_plugin.cc (+7/-0)
Percona-Server/sql/sql_prepare.cc (+103/-21)
Percona-Server/sql/sql_resolver.cc (+21/-8)
Percona-Server/sql/sql_rewrite.cc (+39/-1)
Percona-Server/sql/sql_select.cc (+22/-16)
Percona-Server/sql/sql_show.cc (+33/-20)
Percona-Server/sql/sql_table.cc (+44/-11)
Percona-Server/sql/sql_union.cc (+41/-7)
Percona-Server/sql/sql_view.cc (+1/-1)
Percona-Server/sql/sql_yacc.yy (+14/-1)
Percona-Server/sql/sys_vars.cc (+6/-2)
Percona-Server/sql/transaction.cc (+46/-2)
Percona-Server/sql/transaction.h (+1/-0)
Percona-Server/storage/innobase/api/api0api.cc (+33/-15)
Percona-Server/storage/innobase/btr/btr0cur.cc (+12/-6)
Percona-Server/storage/innobase/buf/buf0buf.cc (+18/-22)
Percona-Server/storage/innobase/buf/buf0flu.cc (+2/-2)
Percona-Server/storage/innobase/dict/dict0stats.cc (+7/-3)
Percona-Server/storage/innobase/fil/fil0fil.cc (+66/-17)
Percona-Server/storage/innobase/fsp/fsp0fsp.cc (+6/-1)
Percona-Server/storage/innobase/fts/fts0ast.cc (+105/-39)
Percona-Server/storage/innobase/fts/fts0config.cc (+3/-3)
Percona-Server/storage/innobase/fts/fts0fts.cc (+39/-39)
Percona-Server/storage/innobase/fts/fts0opt.cc (+10/-10)
Percona-Server/storage/innobase/fts/fts0que.cc (+147/-121)
Percona-Server/storage/innobase/handler/ha_innodb.cc (+47/-9)
Percona-Server/storage/innobase/handler/handler0alter.cc (+10/-12)
Percona-Server/storage/innobase/ibuf/ibuf0ibuf.cc (+0/-3)
Percona-Server/storage/innobase/include/api0api.h (+3/-1)
Percona-Server/storage/innobase/include/fts0ast.h (+6/-1)
Percona-Server/storage/innobase/include/fts0fts.h (+4/-1)
Percona-Server/storage/innobase/include/log0log.h (+3/-1)
Percona-Server/storage/innobase/os/os0file.cc (+6/-17)
Percona-Server/storage/innobase/page/page0cur.cc (+5/-2)
Percona-Server/storage/innobase/page/page0page.cc (+18/-12)
Percona-Server/storage/innobase/row/row0ext.cc (+23/-9)
Percona-Server/storage/innobase/row/row0ftsort.cc (+2/-2)
Percona-Server/storage/innobase/row/row0log.cc (+5/-3)
Percona-Server/storage/innobase/row/row0mysql.cc (+25/-2)
Percona-Server/storage/innobase/row/row0sel.cc (+2/-1)
Percona-Server/storage/innobase/row/row0uins.cc (+8/-7)
Percona-Server/storage/innobase/row/row0umod.cc (+37/-4)
Percona-Server/storage/innobase/srv/srv0start.cc (+60/-30)
Percona-Server/storage/myisam/mi_check.c (+7/-5)
Percona-Server/storage/perfschema/pfs.cc (+3/-3)
Percona-Server/storage/perfschema/pfs_account.cc (+58/-53)
Percona-Server/storage/perfschema/pfs_account.h (+6/-6)
Percona-Server/storage/perfschema/pfs_digest.cc (+25/-11)
Percona-Server/storage/perfschema/pfs_digest.h (+4/-4)
Percona-Server/storage/perfschema/pfs_events_stages.cc (+17/-3)
Percona-Server/storage/perfschema/pfs_events_statements.cc (+17/-3)
Percona-Server/storage/perfschema/pfs_events_waits.cc (+17/-3)
Percona-Server/storage/perfschema/pfs_host.cc (+9/-1)
Percona-Server/storage/perfschema/pfs_host.h (+2/-1)
Percona-Server/storage/perfschema/pfs_instr.cc (+57/-75)
Percona-Server/storage/perfschema/pfs_instr.h (+16/-4)
Percona-Server/storage/perfschema/table_events_statements.cc (+9/-3)
Percona-Server/storage/perfschema/table_helper.cc (+15/-6)
Percona-Server/strings/my_strtoll10.c (+2/-2)
Percona-Server/support-files/mysql.spec.sh (+25/-6)
Percona-Server/unittest/gunit/CMakeLists.txt (+2/-0)
Percona-Server/unittest/gunit/log_throttle-t.cc (+247/-0)
Percona-Server/unittest/gunit/strtoll-t.cc (+48/-0)
Percona-Server/vio/viossl.c (+85/-20)
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