Merge with MySQL 5.1.55

Bug #805173 reported by Seppo Jaakola
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
MySQL patches by Codership
Fix Released
Low
Seppo Jaakola
0.8
Fix Released
Low
Seppo Jaakola
Trunk
Fix Released
Low
Seppo Jaakola

Bug Description

Merge with MySQL 5.1.55, use:

bzr merge -r tag:mysql-5.1.54..tag:mysql-5.1.55 lp:mysql-server/5.1

Changed in codership-mysql:
status: New → In Progress
importance: Undecided → Low
assignee: nobody → Seppo Jaakola (seppo-jaakola)
milestone: none → 0.8.1
Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :
Download full text (59.1 KiB)

seppo@pitbull:~/work/wsrep-trunk/0.8/0.8$ bzr merge -r tag:mysql-5.1.54..tag:mysql-5.1.55 lp:mysql-server/5.1
+N mysql-test/extra/rpl_tests/rpl_test_framework.inc
+N mysql-test/include/assert.inc
+N mysql-test/include/begin_include_file.inc
+N mysql-test/include/ctype_8bit.inc
+N mysql-test/include/end_include_file.inc
+N mysql-test/include/file_does_not_exist.inc
+N mysql-test/include/force_restart.inc
+N mysql-test/include/force_restart_if_skipped.inc
+N mysql-test/include/io_thd_fault_injection.inc
+N mysql-test/include/rpl_change_topology.inc
+N mysql-test/include/rpl_connect.inc
+N mysql-test/include/rpl_connection.inc
+N mysql-test/include/rpl_for_each_slave.inc
+N mysql-test/include/rpl_generate_sync_chain.inc
+N mysql-test/include/rpl_reconnect.inc
+N mysql-test/include/rpl_restart_server.inc
+N mysql-test/include/rpl_start_server.inc
+N mysql-test/include/rpl_start_slaves.inc
+N mysql-test/include/rpl_stop_server.inc
+N mysql-test/include/rpl_stop_slaves.inc
+N mysql-test/include/save_master_pos.inc
+N mysql-test/include/stop_slave_io.inc
+N mysql-test/include/stop_slave_sql.inc
+N mysql-test/include/sync_io_with_master.inc
+N mysql-test/include/sync_slave_sql_with_io.inc
+N mysql-test/include/wait_for_query_to_fail.inc
+N mysql-test/include/write_var_to_file.inc
+N mysql-test/suite/federated/federated_bug_35333.result
+N mysql-test/suite/federated/federated_bug_35333.test
+N mysql-test/suite/innodb_plugin/r/innodb-autoinc-18274.result
+N mysql-test/suite/innodb_plugin/r/innodb-autoinc-56228.result
+N mysql-test/suite/innodb_plugin/t/innodb-autoinc-18274.test
+N mysql-test/suite/innodb_plugin/t/innodb-autoinc-56228-master.opt
+N mysql-test/suite/innodb_plugin/t/innodb-autoinc-56228.test
+N mysql-test/suite/rpl/r/rpl_binlog_errors.result
+N mysql-test/suite/rpl/r/rpl_test_framework.result
+N mysql-test/suite/rpl/t/rpl_binlog_errors-master.opt
+N mysql-test/suite/rpl/t/rpl_binlog_errors.test
+N mysql-test/suite/rpl/t/rpl_test_framework.cnf
+N mysql-test/suite/rpl/t/rpl_test_framework.test
+N mysql-test/suite/sys_vars/r/secure_file_priv2.result
+N mysql-test/suite/sys_vars/t/secure_file_priv2-master.opt
+N mysql-test/suite/sys_vars/t/secure_file_priv2.test
 M BUILD/FINISH.sh
 M BUILD/Makefile.am
 M BUILD/SETUP.sh
 M BUILD/autorun.sh
 M BUILD/build_mccge.sh
 M BUILD/check-cpu
 M BUILD/cleanup
 M BUILD/compile-alpha
 M BUILD/compile-alpha-ccc
 M BUILD/compile-alpha-cxx
 M BUILD/compile-alpha-debug
 M BUILD/compile-amd64-debug-max
 M BUILD/compile-amd64-debug-max-no-ndb
 M BUILD/compile-amd64-gcov
 M BUILD/compile-amd64-gprof
 M BUILD/compile-amd64-max
 M BUILD/compile-amd64-max-sci
 M BUILD/compile-amd64-valgrind-max
 M BUILD/compile-darwin-mwcc
 M BUILD/compile-dist
 M BUILD/compile-hpux11-parisc2-aCC
 M BUILD/compile-ia64-debug-max
 M BUILD/compile-irix-mips64-mipspro
 M BUILD/compile-ndb-autotest
 M BUILD/compile-pentium
 M BUILD/compile-pentium-cybozu
 M BUILD/compile-pentium-debug
 M BUILD/compile-pentium-debug-max
 M BUILD/compile-pentium-debug-max-no-embedded
 M BUILD/compile-pentium-debug-max-no-ndb
 M BUILD/compile-pentium-debug-op...

Changed in codership-mysql:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.