3003 He Zhenxing 2010-07-19
Postfix after merge
modified:
mysql-test/suite/rpl/extension/bhs/rpl_1slave_base.cnf
3002 He Zhenxing 2010-07-18 [merge]
Auto merge
added:
config/ac-macros/gtest.m4
mysql-test/r/server_uuid_embedded.result
mysql-test/t/server_uuid_embedded.test
sql/sql_alloc_error_handler.cc
sql/thr_malloc.h.moved
unittest/CMakeLists.txt
unittest/gunit/
unittest/gunit/CMakeLists.txt
unittest/gunit/FindGTest.cmake
unittest/gunit/Makefile.am
unittest/gunit/gunit_test_main.cc
unittest/gunit/mdl-t.cc
unittest/gunit/mdl_mytap-t.cc
unittest/gunit/sql_list-t.cc
unittest/gunit/tap_event_listener.cc
unittest/gunit/thread_utils-t.cc
unittest/gunit/thread_utils.cc
unittest/gunit/thread_utils.h
unittest/mytap/t/CMakeLists.txt
modified:
.bzrignore
CMakeLists.txt
Makefile.am
client/mysqlbinlog.cc
cmake/ssl.cmake
configure.in
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
libmysqld/lib_sql.cc
mysql-test/extra/binlog_tests/database.test
mysql-test/include/mtr_warnings.sql
mysql-test/mysql-test-run.pl
mysql-test/r/innodb_mysql_lock2.result
mysql-test/suite/binlog/r/binlog_database.result
mysql-test/suite/rpl/r/rpl_server_uuid.result
mysql-test/suite/rpl/t/rpl_server_uuid.test
mysql-test/t/disabled.def
mysql-test/t/innodb_mysql_lock2.test
mysys/default.c
sql/CMakeLists.txt
sql/Makefile.am
sql/mysqld.cc
sql/rpl_record.cc
sql/rpl_slave.cc
sql/rpl_slave.h
sql/sql_db.cc
sql/sql_show.h
sql/sys_vars.cc
sql/thr_malloc.cc
unittest/Makefile.am
unittest/unit.pl
=== modified file 'mysql-test/suite/rpl/extension/bhs/rpl_1slave_base.cnf'
--- a/mysql-test/suite/rpl/extension/bhs/rpl_1slave_base.cnf 2010-06-07 17:12:15 +0000
+++ b/mysql-test/suite/rpl/extension/bhs/rpl_1slave_base.cnf 2010-07-19 08:46:09 +0000
@@ -22,7 +22,6 @@ loose-innodb
log-bin= slave-bin
relay-log= slave-relay-bin
-init-rpl-role= slave
log-slave-updates
master-retry-count= 10
@@ -47,7 +46,6 @@ loose-innodb
log-bin= blackhole-slave-bin
relay-log= blackhole-slave-relay-bin
-init-rpl-role= slave
log-slave-updates
master-retry-count= 10
Attachment: [text/bzr-bundle] bzr/zhenxing.he@sun.com-20100719084609-vbjix1iy2wfk4f9a.bundle
| Thread |
|---|
| • bzr push into mysql-next-mr-rpl-merge branch (zhenxing.he:3002 to 3003) | He Zhenxing | 19 Jul |
