#At file:///home/kgeorge/mysql/bzr/merge-6.0-main-6.0-bugteam/
2829 Georgi Kodinov 2008-09-10 [merge]
merged 6.0-5.1.29-rc to 6.0-bugteam
modified:
mysql-test/t/slave_allow_batching_basic.test
mysql-test/t/slave_compressed_protocol_basic.test
mysql-test/t/slave_exec_mode_basic.test
=== modified file 'mysql-test/t/slave_allow_batching_basic.test'
--- a/mysql-test/t/slave_allow_batching_basic.test 2008-09-05 13:39:08 +0000
+++ b/mysql-test/t/slave_allow_batching_basic.test 2008-09-10 11:07:22 +0000
@@ -23,6 +23,7 @@
# #
################################################################################
+--source include/have_log_bin.inc
--source include/load_sysvars.inc
########################################################################
=== modified file 'mysql-test/t/slave_compressed_protocol_basic.test'
--- a/mysql-test/t/slave_compressed_protocol_basic.test 2008-09-05 13:39:08 +0000
+++ b/mysql-test/t/slave_compressed_protocol_basic.test 2008-09-10 11:07:22 +0000
@@ -23,7 +23,7 @@
# #
###############################################################################
---source include/not_embedded.inc
+--source include/have_log_bin.inc
--source include/load_sysvars.inc
########################################################################
# START OF slave_compressed_protocol TESTS #
=== modified file 'mysql-test/t/slave_exec_mode_basic.test'
--- a/mysql-test/t/slave_exec_mode_basic.test 2008-09-05 13:39:08 +0000
+++ b/mysql-test/t/slave_exec_mode_basic.test 2008-09-10 11:07:22 +0000
@@ -23,6 +23,7 @@
# #
################################################################################
+--source include/have_log_bin.inc
--source include/load_sysvars.inc
########################################################################
| Thread |
|---|
| • bzr commit into mysql-6.0 branch (kgeorge:2829) | Georgi Kodinov | 10 Sep |