lp:~laurynas-biveinis/percona-server/merge-5.5.39
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: 13677 lines (+4181/-4745)218 files modifiedCMakeLists.txt (+8/-1)
VERSION (+2/-2)
client/mysqladmin.cc (+56/-4)
client/mysqldump.c (+28/-11)
cmake/dtrace.cmake (+23/-20)
cmake/install_macros.cmake (+13/-4)
cmake/os/Windows.cmake (+21/-14)
extra/yassl/CMakeLists.txt (+1/-2)
extra/yassl/src/ssl.cpp (+5/-2)
extra/yassl/taocrypt/CMakeLists.txt (+1/-2)
extra/yassl/taocrypt/include/asn.hpp (+4/-4)
include/mysql/thread_pool_priv.h (+3/-1)
libmysql/CMakeLists.txt (+0/-1)
libmysql/authentication_win/CMakeLists.txt (+1/-2)
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 (+3/-3)
man/myisamlog.1 (+2/-2)
man/myisampack.1 (+3/-3)
man/mysql-stress-test.pl.1 (+2/-2)
man/mysql-test-run.pl.1 (+2/-2)
man/mysql.1 (+33/-12)
man/mysql.server.1 (+2/-2)
man/mysql_client_test.1 (+2/-2)
man/mysql_config.1 (+2/-2)
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 (+3/-3)
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 (+30/-6)
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 (+39/-6)
man/mysqlbug.1 (+2/-2)
man/mysqlcheck.1 (+19/-4)
man/mysqld.8 (+2/-2)
man/mysqld_multi.1 (+3/-3)
man/mysqld_safe.1 (+4/-4)
man/mysqldump.1 (+10/-10)
man/mysqldumpslow.1 (+2/-2)
man/mysqlhotcopy.1 (+3/-3)
man/mysqlimport.1 (+3/-3)
man/mysqlshow.1 (+3/-3)
man/mysqlslap.1 (+3/-3)
man/mysqltest.1 (+2/-2)
man/ndb-common-options.1 (+8/-8)
man/ndb_blob_tool.1 (+4/-4)
man/ndb_config.1 (+5/-5)
man/ndb_cpcd.1 (+2/-2)
man/ndb_delete_all.1 (+3/-3)
man/ndb_desc.1 (+4/-4)
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 (+55/-7)
man/ndb_mgm.1 (+5/-5)
man/ndb_mgmd.8 (+14/-16)
man/ndb_print_backup_file.1 (+3/-3)
man/ndb_print_schema_file.1 (+2/-2)
man/ndb_print_sys_file.1 (+2/-2)
man/ndb_restore.1 (+122/-20)
man/ndb_select_all.1 (+5/-5)
man/ndb_select_count.1 (+3/-3)
man/ndb_show_tables.1 (+3/-3)
man/ndb_size.pl.1 (+3/-3)
man/ndb_waiter.1 (+3/-3)
man/ndbd.8 (+7/-7)
man/ndbd_redo_log_reader.1 (+3/-3)
man/ndbinfo_select_all.1 (+3/-3)
man/ndbmtd.8 (+3/-3)
man/perror.1 (+2/-2)
man/replace.1 (+2/-2)
man/resolve_stack_dump.1 (+3/-3)
man/resolveip.1 (+2/-2)
mysql-test/extra/rpl_tests/rpl_stop_slave.test (+4/-0)
mysql-test/include/stop_dump_threads.inc (+32/-0)
mysql-test/include/uninstall_semisync.inc (+5/-0)
mysql-test/r/bug71858.result (+10/-0)
mysql-test/r/failed_auth_3909.result (+2/-2)
mysql-test/r/group_min_max.result (+54/-2)
mysql-test/r/group_min_max_innodb.result (+168/-0)
mysql-test/r/mysqld--help-notwin.result (+2/-2)
mysql-test/r/mysqld--help-win.result (+2/-2)
mysql-test/r/partition_archive.result (+26/-0)
mysql-test/r/partition_pruning.result (+114/-0)
mysql-test/r/percona_bug1289599.result (+2/-2)
mysql-test/r/plugin.result (+70/-0)
mysql-test/r/plugin_auth_qa_3.result (+1/-1)
mysql-test/r/show_processlist.result (+47/-0)
mysql-test/r/union.result (+34/-0)
mysql-test/r/variables.result (+4/-0)
mysql-test/r/view.result (+37/-0)
mysql-test/suite/binlog/t/binlog_killed.test (+8/-0)
mysql-test/suite/innodb/r/bug71585.result (+9/-0)
mysql-test/suite/innodb/r/bug72665.result (+11/-0)
mysql-test/suite/innodb/r/innodb-fk.result (+35/-0)
mysql-test/suite/innodb/t/bug71585.test (+19/-0)
mysql-test/suite/innodb/t/bug72665.test (+14/-0)
mysql-test/suite/innodb/t/innodb-fk.test (+86/-0)
mysql-test/suite/innodb/t/innodb_bug60196-master.opt (+1/-1)
mysql-test/suite/rpl/r/rpl_4threads_deadlock.result (+43/-0)
mysql-test/suite/rpl/r/rpl_semi_sync.result (+2/-2)
mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result (+36/-0)
mysql-test/suite/rpl/r/rpl_stop_slave.result (+7/-2)
mysql-test/suite/rpl/t/rpl_4threads_deadlock.test (+117/-0)
mysql-test/suite/rpl/t/rpl_semi_sync.test (+2/-10)
mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt (+1/-0)
mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test (+145/-0)
mysql-test/suite/rpl/t/rpl_stop_slave.test (+27/-2)
mysql-test/suite/sys_vars/r/timed_mutexes_basic.result (+20/-0)
mysql-test/t/bug71858.test (+14/-0)
mysql-test/t/failed_auth_3909.test (+2/-5)
mysql-test/t/group_min_max.test (+24/-0)
mysql-test/t/group_min_max_innodb.test (+93/-0)
mysql-test/t/long_tmpdir-master.sh (+2/-0)
mysql-test/t/lowercase_mixed_tmpdir-master.sh (+2/-0)
mysql-test/t/lowercase_table4-master.opt (+1/-1)
mysql-test/t/partition_archive.test (+18/-0)
mysql-test/t/partition_pruning.test (+48/-0)
mysql-test/t/percona_bug1289599.test (+2/-2)
mysql-test/t/percona_utility_user-master.opt (+1/-1)
mysql-test/t/plugin.test (+117/-0)
mysql-test/t/show_processlist.test (+63/-0)
mysql-test/t/union.test (+31/-0)
mysql-test/t/view.test (+37/-0)
mysys/CMakeLists.txt (+1/-2)
packaging/rpm-oel/filter-requires.sh (+1/-1)
packaging/rpm-oel/mysql.spec.in (+47/-4)
packaging/rpm-uln/CMakeLists.txt (+0/-38)
packaging/rpm-uln/README-ULN (+0/-15)
packaging/rpm-uln/README.mysql-docs (+0/-4)
packaging/rpm-uln/filter-requires-mysql.sh (+0/-3)
packaging/rpm-uln/generate-tarball.sh (+0/-15)
packaging/rpm-uln/my.cnf (+0/-10)
packaging/rpm-uln/my_config.h (+0/-29)
packaging/rpm-uln/mysql-5.5-errno.patch (+0/-21)
packaging/rpm-uln/mysql-5.5-fix-tests.patch (+0/-34)
packaging/rpm-uln/mysql-5.5-libdir.patch (+0/-28)
packaging/rpm-uln/mysql-5.5-mtr1.patch (+0/-25)
packaging/rpm-uln/mysql-5.5-stack-guard.patch (+0/-140)
packaging/rpm-uln/mysql-5.5-testing.patch (+0/-23)
packaging/rpm-uln/mysql-chain-certs.patch (+0/-45)
packaging/rpm-uln/mysql-embedded-check.c (+0/-26)
packaging/rpm-uln/mysql-expired-certs.patch (+0/-555)
packaging/rpm-uln/mysql-install-test.patch (+0/-33)
packaging/rpm-uln/mysql-strmov.patch (+0/-32)
packaging/rpm-uln/mysql.init (+0/-209)
packaging/rpm-uln/mysql.spec.sh (+0/-1991)
packaging/rpm-uln/scriptstub.c (+0/-32)
scripts/CMakeLists.txt (+1/-0)
scripts/mysql_config.sh (+4/-3)
sql-bench/graph-compare-results.sh (+2/-0)
sql-bench/innotest1.sh (+140/-140)
sql-bench/innotest1a.sh (+106/-106)
sql-bench/innotest1b.sh (+99/-99)
sql-bench/innotest2.sh (+148/-148)
sql-bench/innotest2a.sh (+92/-92)
sql-bench/innotest2b.sh (+102/-102)
sql/event_scheduler.cc (+5/-3)
sql/item_strfunc.cc (+83/-59)
sql/log.cc (+8/-8)
sql/log_event_old.cc (+2/-1)
sql/mysqld.cc (+14/-3)
sql/mysqld.h (+4/-2)
sql/opt_range.cc (+157/-56)
sql/scheduler.cc (+2/-1)
sql/slave.cc (+7/-1)
sql/sql_acl.cc (+72/-49)
sql/sql_class.cc (+28/-1)
sql/sql_insert.cc (+3/-1)
sql/sql_lex.cc (+9/-10)
sql/sql_lex.h (+2/-3)
sql/sql_parse.cc (+2/-2)
sql/sql_partition.cc (+37/-26)
sql/sql_plugin.cc (+67/-4)
sql/sql_plugin.h (+2/-0)
sql/sql_repl.cc (+3/-2)
sql/sql_show.cc (+99/-12)
sql/sql_show.h (+1/-0)
sql/sql_table.cc (+39/-31)
sql/sql_table.h (+3/-0)
sql/sql_union.cc (+7/-1)
sql/sql_view.cc (+46/-14)
sql/sql_yacc.yy (+8/-11)
sql/sys_vars.cc (+5/-4)
sql/table.cc (+29/-6)
sql/threadpool_common.cc (+1/-0)
sql/threadpool_unix.cc (+2/-2)
storage/heap/hp_block.c (+3/-2)
storage/heap/hp_create.c (+2/-2)
storage/innobase/dict/dict0crea.c (+38/-4)
storage/innobase/dict/dict0dict.c (+84/-31)
storage/innobase/dict/dict0load.c (+84/-9)
storage/innobase/dict/dict0mem.c (+14/-1)
storage/innobase/handler/i_s.cc (+13/-0)
storage/innobase/include/dict0dict.h (+38/-1)
storage/innobase/include/dict0dict.ic (+60/-1)
storage/innobase/include/dict0load.h (+12/-0)
storage/innobase/include/dict0mem.h (+10/-2)
storage/myisam/ha_myisam.cc (+0/-1)
strings/CMakeLists.txt (+1/-2)
strings/ctype-bin.c (+2/-1)
strings/ctype-eucjpms.c (+2/-1)
strings/ctype-ujis.c (+2/-1)
support-files/CMakeLists.txt (+4/-2)
support-files/mysql.spec.sh (+6/-1)
vio/CMakeLists.txt (+1/-2)
zlib/CMakeLists.txt (+1/-2)
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