Luis Soares
58e2fde011
manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
...
Conflicts
=========
Text conflict in .bzr-mysql/default.conf
Text conflict in libmysqld/CMakeLists.txt
Text conflict in libmysqld/Makefile.am
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/Makefile.am
Text conflict in sql/log_event_old.cc
Text conflict in sql/rpl_rli.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_binlog.cc
Text conflict in sql/sql_lex.h
21 conflicts encountered.
NOTE
====
mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr:
- "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr"
This is the first cset (merge/...) committed after pulling
from mysql-next-mr.
2009-10-22 23:30:28 +01:00
..
2008-12-19 16:03:32 +01:00
2009-03-12 17:55:10 +01:00
2009-02-27 21:43:43 +01:00
2009-03-12 17:55:10 +01:00
2009-02-27 21:43:43 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-01-29 17:59:46 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-01-29 17:59:46 +01:00
2008-12-19 16:03:32 +01:00
2009-01-30 15:44:49 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-02-24 16:20:00 +02:00
2009-03-12 17:55:10 +01:00
2009-01-29 17:59:46 +01:00
2009-02-27 21:43:43 +01:00
2008-12-19 16:03:32 +01:00
2009-02-27 21:43:43 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-01-29 17:59:46 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-03-20 18:11:22 +01:00
2009-02-27 21:43:43 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-02-27 21:43:43 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-02-27 21:43:43 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-03-20 18:11:22 +01:00
2008-12-19 16:03:32 +01:00
2009-01-29 17:59:46 +01:00
2009-01-29 17:59:46 +01:00
2009-01-29 17:59:46 +01:00
2009-02-27 21:43:43 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-02-17 13:24:09 +01:00
2008-12-19 16:03:32 +01:00
2009-01-29 17:59:46 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-07-23 16:06:44 +02:00
2008-07-23 16:06:44 +02:00
2008-12-19 16:03:32 +01:00
2009-05-22 01:22:46 +05:00
2008-12-19 16:03:32 +01:00
2009-01-29 17:59:46 +01:00
2009-02-17 13:24:09 +01:00
2009-08-07 22:04:53 +02:00
2008-12-19 16:03:32 +01:00
2009-05-22 01:22:46 +05:00
2008-12-19 16:03:32 +01:00
2009-08-07 22:04:53 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-02-17 13:24:09 +01:00
2009-01-30 17:59:10 +01:00
2008-07-23 16:06:44 +02:00
2008-07-23 16:06:44 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-08-07 22:04:53 +02:00
2009-08-07 22:04:53 +02:00
2008-12-19 16:03:32 +01:00
2009-01-29 17:59:46 +01:00
2009-02-17 13:24:09 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-02-27 21:43:43 +01:00
2009-03-20 18:11:22 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2008-12-19 16:03:32 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-01-29 17:59:46 +01:00
2009-03-20 18:11:22 +01:00
2008-07-23 16:06:44 +02:00
2009-03-20 18:11:22 +01:00
2008-07-23 16:06:44 +02:00
2009-03-20 18:11:22 +01:00
2008-07-23 16:06:44 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-01-29 17:59:46 +01:00
2009-01-29 17:59:46 +01:00
2008-12-19 16:03:32 +01:00
2009-01-29 17:59:46 +01:00
2009-02-16 08:38:15 -03:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-01-29 17:59:46 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-02-27 21:43:43 +01:00
2009-01-29 17:59:46 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2008-12-19 16:03:32 +01:00
2009-02-27 21:43:43 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-02-27 21:43:43 +01:00
2009-02-27 21:43:43 +01:00
2009-02-27 21:43:43 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-02-27 21:43:43 +01:00
2008-12-19 16:03:32 +01:00
2009-02-27 21:43:43 +01:00
2009-02-27 21:43:43 +01:00
2008-12-19 16:03:32 +01:00
2009-02-27 21:43:43 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-01-29 17:59:46 +01:00
2009-02-27 21:43:43 +01:00
2009-01-29 17:59:46 +01:00
2009-02-27 21:43:43 +01:00
2008-12-19 16:03:32 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-02-27 21:43:43 +01:00
2009-01-29 17:59:46 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-01-29 17:59:46 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-02-27 21:43:43 +01:00
2009-02-27 21:43:43 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-02-27 21:43:43 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-02-27 21:43:43 +01:00
2009-02-27 21:43:43 +01:00
2009-02-27 21:43:43 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-01-29 17:59:46 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2008-12-19 16:03:32 +01:00
2009-01-29 17:59:46 +01:00
2008-12-19 16:03:32 +01:00
2009-03-20 18:11:22 +01:00
2009-01-22 11:14:16 +01:00
2009-04-03 11:37:48 +02:00
2009-01-29 17:59:46 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-03-20 18:11:22 +01:00
2008-12-19 16:03:32 +01:00
2009-10-02 17:12:10 +08:00
2009-03-20 18:11:22 +01:00
2008-12-19 16:03:32 +01:00
2009-05-22 01:22:46 +05:00
2009-03-20 18:11:22 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-03-20 18:11:22 +01:00
2009-03-12 17:55:10 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-02-27 21:43:43 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-02-27 21:43:43 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-01-29 17:59:46 +01:00
2009-01-29 17:59:46 +01:00
2009-03-20 18:11:22 +01:00
2009-01-08 19:13:57 +01:00
2009-01-08 19:13:57 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-03-20 18:11:22 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-05-22 01:22:46 +05:00
2008-12-19 16:03:32 +01:00
2009-05-22 01:22:46 +05:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-08-07 22:04:53 +02:00
2009-02-27 21:43:43 +01:00
2009-06-11 12:07:59 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-03-20 18:11:22 +01:00
2008-12-19 16:03:32 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00
2009-03-20 18:11:22 +01:00
2009-04-03 11:37:48 +02:00
2008-12-19 16:03:32 +01:00
2008-12-19 16:03:32 +01:00