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

Created by Laurynas Biveinis on 2013-05-26 and last modified on 2013-05-27
Get this branch:
bzr branch lp:~laurynas-biveinis/percona-server/tree-fixes-5.5
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

481. By Laurynas Biveinis on 2013-05-25

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

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

COPYING.show_temp_51
Percona-Server/include/flashcache_ioctl.h
Percona-Server/mysql-test/include/have_response_time_distribution.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_server_variables.inc
Percona-Server/mysql-test/include/percona_show_slave_status_nolock.inc
Percona-Server/mysql-test/include/query_response_time-replication.inc
Percona-Server/mysql-test/include/query_response_time-stored.inc
Percona-Server/mysql-test/include/query_response_time.inc
Percona-Server/mysql-test/lib/Subunit.pm
Percona-Server/mysql-test/r/have_response_time_distribution.require
Percona-Server/mysql-test/r/percona_bug45702.result
Percona-Server/mysql-test/r/percona_bug933969.result
Percona-Server/mysql-test/r/percona_innodb_buffer_pool_shm.result
Percona-Server/mysql-test/r/percona_innodb_deadlock_count.result
Percona-Server/mysql-test/r/percona_innodb_doublewrite_file.result
Percona-Server/mysql-test/r/percona_innodb_expand_fast_index_creation.result
Percona-Server/mysql-test/r/percona_innodb_use_sys_stats_table.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_query_cache_with_comments_prepared_statements.result
Percona-Server/mysql-test/r/percona_query_response_time-replication.result
Percona-Server/mysql-test/r/percona_query_response_time-stored.result
Percona-Server/mysql-test/r/percona_query_response_time.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_sql_no_fcache.result
Percona-Server/mysql-test/r/percona_status_wait_query_cache_mutex.result
Percona-Server/mysql-test/r/percona_utf8_general50_ci.result
Percona-Server/mysql-test/r/percona_xtradb_admin_command.result
Percona-Server/mysql-test/r/percona_xtradb_bug317074.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/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_buffer_pool_shm-master.opt
Percona-Server/mysql-test/t/percona_innodb_buffer_pool_shm.test
Percona-Server/mysql-test/t/percona_innodb_deadlock_count.test
Percona-Server/mysql-test/t/percona_innodb_doublewrite_file-master.opt
Percona-Server/mysql-test/t/percona_innodb_doublewrite_file.test
Percona-Server/mysql-test/t/percona_innodb_expand_fast_index_creation.test
Percona-Server/mysql-test/t/percona_innodb_use_sys_stats_table-master.opt
Percona-Server/mysql-test/t/percona_innodb_use_sys_stats_table.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_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_query_response_time-replication.test
Percona-Server/mysql-test/t/percona_query_response_time-stored.test
Percona-Server/mysql-test/t/percona_query_response_time.test
Percona-Server/mysql-test/t/percona_server_variables_debug.test
Percona-Server/mysql-test/t/percona_server_variables_release.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_sql_no_fcache.test
Percona-Server/mysql-test/t/percona_status_wait_query_cache_mutex.test
Percona-Server/mysql-test/t/percona_ucs2_general50_ci.test
Percona-Server/mysql-test/t/percona_utf8_general50_ci.test
Percona-Server/mysql-test/t/percona_xtradb_admin_command.test
Percona-Server/mysql-test/t/percona_xtradb_bug317074.test
Percona-Server/mysql-test/t/query_cache_disabled-master.opt
Percona-Server/sql/query_response_time.cc
Percona-Server/sql/query_response_time.h
Percona-Server/sql/query_strip_comments.h
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/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/innodb_stats.rst
doc/source/diagnostics/misc_info_schema_tables.rst
doc/source/diagnostics/mysql_syslog.rst
doc/source/diagnostics/process_list.rst
doc/source/diagnostics/response_time_distribution.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/feature_comparison.rst
doc/source/flexibility/buff_read_ahead_area.rst
doc/source/flexibility/innodb_fast_shutdown.rst
doc/source/flexibility/log_warnings_suppress.rst
doc/source/flexibility/mysql_remove_eol_carret.rst
doc/source/glossary.rst
doc/source/installation.rst
doc/source/management/innodb_dict_size_limit.rst
doc/source/management/innodb_expand_import.rst
doc/source/management/innodb_expanded_fast_index_creation.rst
doc/source/management/innodb_fake_changes.rst
doc/source/management/innodb_lru_dump_restore.rst
doc/source/management/innodb_recovery_patches.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/innodb_fast_checksum.rst
doc/source/performance/innodb_lazy_drop_table.rst
doc/source/performance/innodb_opt_lru_count.rst
doc/source/performance/remove_fcntl_excessive_calls.rst
doc/source/reliability/crash_resistant_replication.rst
doc/source/reliability/error_pad.rst
doc/source/reliability/innodb_corrupt_table_action.rst
doc/source/reliability/log_connection_error.rst
doc/source/scalability/innodb_extra_rseg.rst
doc/source/scalability/innodb_insert_buffer.rst
doc/source/scalability/innodb_split_buf_pool_mutex.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

Did not adjust file-ids that are incorrect for the upstream files.

Did not adjust file-ids for
Percona-Server/mysql-test/t/query_cache_disabled-master.opt
Percona-Server/mysql-test/t/query_cache_disabled.test
Percona-Server/mysql-test/r/query_cache_disabled.result
due to upstream introducing these files in 5.5, thus we have own in
5.1 and take theirs in 5.5.

Did not handle files that have versions in their names,
e.g. slow_extended.rst vs slow_extended_55.rst.

Did not adjust file-ids for man/*, as these are imported from source
tarballs, thus have no relation between the branches.

Did not adjust file-ids for
doc/source/release-notes/release-notes_index.rst
because it's version-specific.

480. By Laurynas Biveinis on 2013-05-23

Manually merge bug 1160951 (Delete Percona-Server/patch-info
directory) from 5.1. The merge is manual because the file-ids
differed.

479. By <email address hidden> on 2013-03-23

Merge lp:~akopytov/percona-server/bug1125248

475. By <email address hidden> on 2013-03-22

Merge lp:~akopytov/percona-server/bug989253-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.