lp:~laurynas-biveinis/percona-server/tree-fixes-5.6

Created by Laurynas Biveinis and last modified
Get this branch:
bzr branch lp:~laurynas-biveinis/percona-server/tree-fixes-5.6
Only Laurynas Biveinis can upload to this branch. If you are Laurynas Biveinis please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Recent revisions

354. By Laurynas Biveinis on 2013-05-26

Manually merge bug 1099764 (Different bzr file-ids for the same files
in 5.1, 5.5, and 5.6) from 5.5.

Re-add the following files with file-ids from the 5.5 tree:

  COPYING.innodb-deadlock-count-patch
  COPYING.show_temp_51
  Percona-Server/mysql-test/include/have_pool_of_threads.inc
  Percona-Server/mysql-test/include/log_grep.inc
  Percona-Server/mysql-test/include/percona_query_cache_with_comments.inc
  Percona-Server/mysql-test/include/percona_query_cache_with_comments_begin.inc
  Percona-Server/mysql-test/include/percona_query_cache_with_comments_clear.inc
  Percona-Server/mysql-test/include/percona_query_cache_with_comments_end.inc
  Percona-Server/mysql-test/include/percona_query_cache_with_comments_eval.inc
  Percona-Server/mysql-test/include/percona_query_cache_with_comments_show.inc
  Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc
  Percona-Server/mysql-test/lib/Subunit.pm
  Percona-Server/mysql-test/r/aborted_clients.result
  Percona-Server/mysql-test/r/have_pool_of_threads.require
  Percona-Server/mysql-test/r/percona_bug45702.result
  Percona-Server/mysql-test/r/percona_bug933969.result
  Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result
  Percona-Server/mysql-test/r/percona_innodb_version.result
  Percona-Server/mysql-test/r/percona_log_connection_error.result
  Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config.result
  Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_false.result
  Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_foo.result
  Percona-Server/mysql-test/r/percona_log_slow_admin_statements-config_true.result
  Percona-Server/mysql-test/r/percona_log_slow_filter-cl.result
  Percona-Server/mysql-test/r/percona_log_slow_slave_statements-cl.result
  Percona-Server/mysql-test/r/percona_log_slow_sp_statements-cl.result
  Percona-Server/mysql-test/r/percona_log_slow_verbosity-cl.result
  Percona-Server/mysql-test/r/percona_min_examined_row_limit.result
  Percona-Server/mysql-test/r/percona_query_cache_with_comments.result
  Percona-Server/mysql-test/r/percona_query_cache_with_comments_crash.result
  Percona-Server/mysql-test/r/percona_query_cache_with_comments_disable.result
  Percona-Server/mysql-test/r/percona_query_cache_with_comments_prepared_statements.result
  Percona-Server/mysql-test/r/percona_show_slave_status_nolock.result
  Percona-Server/mysql-test/r/percona_show_temp_tables.result
  Percona-Server/mysql-test/r/percona_status_wait_query_cache_mutex.result
  Percona-Server/mysql-test/r/percona_xtradb_bug317074.result
  Percona-Server/mysql-test/r/pool_of_threads.result
  Percona-Server/mysql-test/suite/rpl/r/percona_bug860910.result
  Percona-Server/mysql-test/suite/rpl/t/percona_bug860910.cnf
  Percona-Server/mysql-test/suite/rpl/t/percona_bug860910.test
  Percona-Server/mysql-test/suite/sys_vars/r/extra_max_connections_basic.result
  Percona-Server/mysql-test/suite/sys_vars/r/extra_port_basic.result
  Percona-Server/mysql-test/suite/sys_vars/r/query_exec_id_basic.result
  Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_idle_timeout_basic.result
  Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_max_threads_basic.result
  Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_min_threads_basic.result
  Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_oversubscribe_basic.result
  Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_size_basic.result
  Percona-Server/mysql-test/suite/sys_vars/r/thread_pool_stall_limit_basic.result
  Percona-Server/mysql-test/suite/sys_vars/t/extra_max_connections_basic.test
  Percona-Server/mysql-test/suite/sys_vars/t/extra_port_basic.test
  Percona-Server/mysql-test/suite/sys_vars/t/query_exec_id_basic.test
  Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_idle_timeout_basic.test
  Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_max_threads_basic.test
  Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_min_threads_basic.test
  Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_oversubscribe_basic.test
  Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_size_basic.test
  Percona-Server/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test
  Percona-Server/mysql-test/t/aborted_clients.test
  Percona-Server/mysql-test/t/percona_bug45702.test
  Percona-Server/mysql-test/t/percona_bug643149.test
  Percona-Server/mysql-test/t/percona_bug933969.test
  Percona-Server/mysql-test/t/percona_innodb_deadlock_count.test
  Percona-Server/mysql-test/t/percona_innodb_version.test
  Percona-Server/mysql-test/t/percona_log_connection_error-master.opt
  Percona-Server/mysql-test/t/percona_log_connection_error.test
  Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config.cnf
  Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config.test
  Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_false.cnf
  Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_false.test
  Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_foo.cnf
  Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_foo.test
  Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_true.cnf
  Percona-Server/mysql-test/t/percona_log_slow_admin_statements-config_true.test
  Percona-Server/mysql-test/t/percona_log_slow_filter-cl-master.opt
  Percona-Server/mysql-test/t/percona_log_slow_filter-cl.test
  Percona-Server/mysql-test/t/percona_log_slow_slave_statements-cl-master.opt
  Percona-Server/mysql-test/t/percona_log_slow_slave_statements-cl.test
  Percona-Server/mysql-test/t/percona_log_slow_sp_statements-cl-master.opt
  Percona-Server/mysql-test/t/percona_log_slow_sp_statements-cl.test
  Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl-master.opt
  Percona-Server/mysql-test/t/percona_log_slow_verbosity-cl.test
  Percona-Server/mysql-test/t/percona_query_cache_with_comments.test
  Percona-Server/mysql-test/t/percona_query_cache_with_comments_crash.test
  Percona-Server/mysql-test/t/percona_query_cache_with_comments_disable.test
  Percona-Server/mysql-test/t/percona_query_cache_with_comments_prepared_statements.test
  Percona-Server/mysql-test/t/percona_show_slave_status_nolock.test
  Percona-Server/mysql-test/t/percona_show_temp_tables.test
  Percona-Server/mysql-test/t/percona_status_wait_query_cache_mutex.test
  Percona-Server/mysql-test/t/percona_xtradb_bug317074.test
  Percona-Server/mysql-test/t/pool_of_threads.cnf
  Percona-Server/mysql-test/t/pool_of_threads.test
  Percona-Server/sql/query_strip_comments.h
  Percona-Server/sql/threadpool.h
  Percona-Server/sql/threadpool_common.cc
  Percona-Server/sql/threadpool_unix.cc
  Percona-Server/sql/threadpool_win.cc
  UDF/
  UDF/Makefile.am
  UDF/configure.ac
  UDF/src/
  UDF/src/Makefile.am
  UDF/src/fnv1a_udf.cc
  UDF/src/fnv_udf.cc
  UDF/src/murmur_udf.cc
  build/debian/additions/
  build/debian/additions/debian-start
  build/debian/additions/debian-start.inc.sh
  build/debian/changelog
  build/debian/compat
  build/debian/copyright
  build/debian/patches/
  build/debian/patches/00list
  build/debian/patches/10_percona-server-prefix.dpatch
  build/debian/patches/20_scripts__mysql_create_system_tables__no_test.dpatch
  build/debian/patches/30_scripts__mysqld_safe.sh__signals.dpatch
  build/debian/patches/40_scripts__mysql_install_db.sh__no_test.dpatch
  build/debian/patches/50_mysql-test__db_test.dpatch
  build/debian/po/
  doc/make.bat
  doc/source/_static/
  doc/source/_templates/
  doc/source/compatibility.rst
  doc/source/development.rst
  doc/source/diagnostics/innodb_deadlock_count.rst
  doc/source/diagnostics/misc_info_schema_tables.rst
  doc/source/diagnostics/mysql_syslog.rst
  doc/source/diagnostics/process_list.rst
  doc/source/diagnostics/show_engines.rst
  doc/source/diagnostics/user_stats.rst
  doc/source/ext/
  doc/source/ext/psdom.py
  doc/source/faq.rst
  doc/source/flexibility/buff_read_ahead_area.rst
  doc/source/flexibility/innodb_files_extend.rst
  doc/source/flexibility/log_warnings_suppress.rst
  doc/source/glossary.rst
  doc/source/installation.rst
  doc/source/management/innodb_expanded_fast_index_creation.rst
  doc/source/management/innodb_fake_changes.rst
  doc/source/percona-server-logo.jpg
  doc/source/percona-xtrabackup-logo.jpg
  doc/source/percona-xtradb.png
  doc/source/percona_favicon.ico
  doc/source/percona_xtradb.rst
  doc/source/performance/query_cache_enhance.rst
  doc/source/reliability/error_pad.rst
  doc/source/reliability/innodb_corrupt_table_action.rst
  doc/source/reliability/log_connection_error.rst
  doc/source/trademark-policy.rst
  python-for-subunit2junitxml/
  python-for-subunit2junitxml/BytesIO.py
  python-for-subunit2junitxml/iso8601/
  python-for-subunit2junitxml/iso8601/LICENSE
  python-for-subunit2junitxml/iso8601/README
  python-for-subunit2junitxml/iso8601/README.subunit
  python-for-subunit2junitxml/iso8601/setup.py
  python-for-subunit2junitxml/iso8601/test_iso8601.py
  python-for-subunit2junitxml/junitxml/
  python-for-subunit2junitxml/junitxml/__init__.py
  python-for-subunit2junitxml/junitxml/tests/
  python-for-subunit2junitxml/junitxml/tests/__init__.py
  python-for-subunit2junitxml/junitxml/tests/test_junitxml.py
  python-for-subunit2junitxml/subunit/
  python-for-subunit2junitxml/subunit/__init__.py
  python-for-subunit2junitxml/subunit/chunked.py
  python-for-subunit2junitxml/subunit/details.py
  python-for-subunit2junitxml/subunit/iso8601.py
  python-for-subunit2junitxml/subunit/progress_model.py
  python-for-subunit2junitxml/subunit/run.py
  python-for-subunit2junitxml/subunit/test_results.py
  python-for-subunit2junitxml/subunit/tests/
  python-for-subunit2junitxml/subunit/tests/TestUtil.py
  python-for-subunit2junitxml/subunit/tests/__init__.py
  python-for-subunit2junitxml/subunit/tests/sample-script.py
  python-for-subunit2junitxml/subunit/tests/sample-two-script.py
  python-for-subunit2junitxml/subunit/tests/test_chunked.py
  python-for-subunit2junitxml/subunit/tests/test_details.py
  python-for-subunit2junitxml/subunit/tests/test_progress_model.py
  python-for-subunit2junitxml/subunit/tests/test_subunit_filter.py
  python-for-subunit2junitxml/subunit/tests/test_subunit_stats.py
  python-for-subunit2junitxml/subunit/tests/test_subunit_tags.py
  python-for-subunit2junitxml/subunit/tests/test_tap2subunit.py
  python-for-subunit2junitxml/subunit/tests/test_test_protocol.py
  python-for-subunit2junitxml/subunit/tests/test_test_results.py
  python-for-subunit2junitxml/testtools/
  python-for-subunit2junitxml/testtools/__init__.py
  python-for-subunit2junitxml/testtools/_spinner.py
  python-for-subunit2junitxml/testtools/compat.py
  python-for-subunit2junitxml/testtools/content.py
  python-for-subunit2junitxml/testtools/content_type.py
  python-for-subunit2junitxml/testtools/deferredruntest.py
  python-for-subunit2junitxml/testtools/distutilscmd.py
  python-for-subunit2junitxml/testtools/helpers.py
  python-for-subunit2junitxml/testtools/matchers.py
  python-for-subunit2junitxml/testtools/monkey.py
  python-for-subunit2junitxml/testtools/run.py
  python-for-subunit2junitxml/testtools/runtest.py
  python-for-subunit2junitxml/testtools/testcase.py
  python-for-subunit2junitxml/testtools/testresult/
  python-for-subunit2junitxml/testtools/testresult/__init__.py
  python-for-subunit2junitxml/testtools/testresult/doubles.py
  python-for-subunit2junitxml/testtools/testresult/real.py
  python-for-subunit2junitxml/testtools/tests/
  python-for-subunit2junitxml/testtools/tests/__init__.py
  python-for-subunit2junitxml/testtools/tests/helpers.py
  python-for-subunit2junitxml/testtools/tests/test_compat.py
  python-for-subunit2junitxml/testtools/tests/test_content.py
  python-for-subunit2junitxml/testtools/tests/test_content_type.py
  python-for-subunit2junitxml/testtools/tests/test_deferredruntest.py
  python-for-subunit2junitxml/testtools/tests/test_distutilscmd.py
  python-for-subunit2junitxml/testtools/tests/test_fixturesupport.py
  python-for-subunit2junitxml/testtools/tests/test_helpers.py
  python-for-subunit2junitxml/testtools/tests/test_matchers.py
  python-for-subunit2junitxml/testtools/tests/test_monkey.py
  python-for-subunit2junitxml/testtools/tests/test_run.py
  python-for-subunit2junitxml/testtools/tests/test_runtest.py
  python-for-subunit2junitxml/testtools/tests/test_spinner.py
  python-for-subunit2junitxml/testtools/tests/test_testresult.py
  python-for-subunit2junitxml/testtools/tests/test_testsuite.py
  python-for-subunit2junitxml/testtools/tests/test_testtools.py
  python-for-subunit2junitxml/testtools/tests/test_with_with.py
  python-for-subunit2junitxml/testtools/testsuite.py
  python-for-subunit2junitxml/testtools/utils.py
  subunit2junitxml

At the same time fix bug 1183585 (README.HandlerSocket in 5.6 tree) by
deleting it.

353. By Laurynas Biveinis on 2013-05-25

Null-merge bug 1160951 fix from 5.5

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
This branch contains Public information 
Everyone can see this information.