lp:~laurynas-biveinis/percona-server/merge-5.5.34
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.
- Alexey Kopytov (community): Approve
-
Diff: 19586 lines (+8423/-2045)166 files modifiedMakefile (+2/-2)
Percona-Server/VERSION (+1/-1)
Percona-Server/client/mysqldump.c (+2/-2)
Percona-Server/include/mysql/plugin_audit.h (+5/-1)
Percona-Server/include/mysql/plugin_audit.h.pp (+4/-0)
Percona-Server/libmysqld/lib_sql.cc (+7/-6)
Percona-Server/man/comp_err.1 (+23/-8)
Percona-Server/man/innochecksum.1 (+13/-4)
Percona-Server/man/msql2mysql.1 (+13/-4)
Percona-Server/man/my_print_defaults.1 (+15/-6)
Percona-Server/man/myisam_ftdump.1 (+15/-6)
Percona-Server/man/myisamchk.1 (+59/-32)
Percona-Server/man/myisamlog.1 (+17/-14)
Percona-Server/man/myisampack.1 (+18/-9)
Percona-Server/man/mysql-stress-test.pl.1 (+13/-4)
Percona-Server/man/mysql-test-run.pl.1 (+71/-14)
Percona-Server/man/mysql.1 (+308/-66)
Percona-Server/man/mysql.server.1 (+15/-6)
Percona-Server/man/mysql_client_test.1 (+14/-5)
Percona-Server/man/mysql_client_test_embedded.1 (+1/-1)
Percona-Server/man/mysql_config.1 (+27/-20)
Percona-Server/man/mysql_convert_table_format.1 (+15/-6)
Percona-Server/man/mysql_find_rows.1 (+14/-5)
Percona-Server/man/mysql_fix_extensions.1 (+13/-4)
Percona-Server/man/mysql_install_db.1 (+48/-44)
Percona-Server/man/mysql_plugin.1 (+15/-8)
Percona-Server/man/mysql_secure_installation.1 (+14/-8)
Percona-Server/man/mysql_setpermission.1 (+15/-6)
Percona-Server/man/mysql_tzinfo_to_sql.1 (+15/-6)
Percona-Server/man/mysql_upgrade.1 (+49/-19)
Percona-Server/man/mysql_waitpid.1 (+13/-4)
Percona-Server/man/mysql_zap.1 (+13/-4)
Percona-Server/man/mysqlaccess.1 (+16/-7)
Percona-Server/man/mysqladmin.1 (+46/-19)
Percona-Server/man/mysqlbinlog.1 (+130/-79)
Percona-Server/man/mysqlbug.1 (+13/-4)
Percona-Server/man/mysqlcheck.1 (+26/-17)
Percona-Server/man/mysqld.8 (+13/-4)
Percona-Server/man/mysqld_multi.1 (+20/-11)
Percona-Server/man/mysqld_safe.1 (+38/-8)
Percona-Server/man/mysqldump.1 (+210/-70)
Percona-Server/man/mysqldumpslow.1 (+16/-7)
Percona-Server/man/mysqlhotcopy.1 (+14/-5)
Percona-Server/man/mysqlimport.1 (+28/-23)
Percona-Server/man/mysqlshow.1 (+24/-15)
Percona-Server/man/mysqlslap.1 (+69/-42)
Percona-Server/man/mysqltest.1 (+49/-5)
Percona-Server/man/mysqltest_embedded.1 (+1/-1)
Percona-Server/man/ndb-common-options.1 (+655/-0)
Percona-Server/man/ndb_blob_tool.1 (+499/-0)
Percona-Server/man/ndb_config.1 (+336/-63)
Percona-Server/man/ndb_cpcd.1 (+13/-4)
Percona-Server/man/ndb_delete_all.1 (+82/-6)
Percona-Server/man/ndb_desc.1 (+314/-45)
Percona-Server/man/ndb_drop_index.1 (+53/-11)
Percona-Server/man/ndb_drop_table.1 (+49/-8)
Percona-Server/man/ndb_error_reporter.1 (+51/-7)
Percona-Server/man/ndb_index_stat.1 (+987/-0)
Percona-Server/man/ndb_mgm.1 (+65/-10)
Percona-Server/man/ndb_mgmd.8 (+306/-91)
Percona-Server/man/ndb_print_backup_file.1 (+18/-9)
Percona-Server/man/ndb_print_schema_file.1 (+18/-9)
Percona-Server/man/ndb_print_sys_file.1 (+19/-10)
Percona-Server/man/ndb_restore.1 (+673/-139)
Percona-Server/man/ndb_select_all.1 (+229/-16)
Percona-Server/man/ndb_select_count.1 (+76/-9)
Percona-Server/man/ndb_show_tables.1 (+108/-9)
Percona-Server/man/ndb_size.pl.1 (+184/-55)
Percona-Server/man/ndb_waiter.1 (+109/-9)
Percona-Server/man/ndbd.8 (+316/-61)
Percona-Server/man/ndbd_redo_log_reader.1 (+61/-12)
Percona-Server/man/ndbinfo_select_all.1 (+306/-0)
Percona-Server/man/ndbmtd.8 (+18/-9)
Percona-Server/man/perror.1 (+13/-4)
Percona-Server/man/replace.1 (+13/-4)
Percona-Server/man/resolve_stack_dump.1 (+16/-4)
Percona-Server/man/resolveip.1 (+13/-4)
Percona-Server/mysql-test/collections/default.experimental (+0/-2)
Percona-Server/mysql-test/include/handler.inc (+2/-3)
Percona-Server/mysql-test/include/have_valgrind.inc (+11/-0)
Percona-Server/mysql-test/lib/v1/mysql-test-run.pl (+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/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/suite/binlog/r/binlog_database.result (+1/-1)
Percona-Server/mysql-test/suite/binlog/r/binlog_innodb_row.result (+1/-1)
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/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 (+114/-114)
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_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/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/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/mysys/my_winthread.c (+4/-2)
Percona-Server/scripts/mysqld_safe.sh (+1/-1)
Percona-Server/sql/event_scheduler.cc (+51/-33)
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 (+1/-1)
Percona-Server/sql/handler.cc (+9/-3)
Percona-Server/sql/item_subselect.cc (+4/-1)
Percona-Server/sql/log.cc (+4/-3)
Percona-Server/sql/log_event.cc (+11/-1)
Percona-Server/sql/log_event_old.cc (+4/-1)
Percona-Server/sql/mysqld.cc (+83/-30)
Percona-Server/sql/mysqld.h (+1/-0)
Percona-Server/sql/partition_info.cc (+2/-3)
Percona-Server/sql/rpl_rli.cc (+9/-2)
Percona-Server/sql/rpl_utility.cc (+14/-6)
Percona-Server/sql/set_var.cc (+2/-2)
Percona-Server/sql/slave.cc (+4/-2)
Percona-Server/sql/sp_head.cc (+25/-9)
Percona-Server/sql/sql_acl.cc (+37/-29)
Percona-Server/sql/sql_admin.cc (+14/-2)
Percona-Server/sql/sql_audit.cc (+4/-0)
Percona-Server/sql/sql_audit.h (+59/-23)
Percona-Server/sql/sql_base.cc (+19/-19)
Percona-Server/sql/sql_base.h (+4/-2)
Percona-Server/sql/sql_cache.cc (+7/-2)
Percona-Server/sql/sql_class.cc (+79/-23)
Percona-Server/sql/sql_class.h (+32/-5)
Percona-Server/sql/sql_connect.cc (+40/-27)
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_manager.cc (+6/-3)
Percona-Server/sql/sql_parse.cc (+40/-9)
Percona-Server/sql/sql_partition.cc (+1/-0)
Percona-Server/sql/sql_prepare.cc (+18/-1)
Percona-Server/sql/sql_show.cc (+39/-46)
Percona-Server/sql/sql_table.cc (+44/-11)
Percona-Server/sql/sql_view.cc (+1/-1)
Percona-Server/sql/sys_vars.cc (+6/-2)
Percona-Server/sql/transaction.cc (+47/-3)
Percona-Server/sql/transaction.h (+1/-0)
Percona-Server/storage/innobase/btr/btr0cur.c (+12/-6)
Percona-Server/storage/innobase/buf/buf0buf.c (+15/-33)
Percona-Server/storage/innobase/handler/ha_innodb.cc (+32/-5)
Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c (+0/-3)
Percona-Server/storage/innobase/row/row0mysql.c (+19/-1)
Percona-Server/storage/innobase/row/row0sel.c (+2/-1)
Percona-Server/storage/innobase/row/row0uins.c (+8/-7)
Percona-Server/storage/innobase/row/row0umod.c (+41/-5)
Percona-Server/storage/myisam/mi_check.c (+7/-5)
Percona-Server/strings/my_strtoll10.c (+2/-2)
Percona-Server/support-files/mysql.spec.sh (+27/-10)
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