From: Shivji Kumar Jha
Date: October 30 2012 5:17am
Subject: bzr push into mysql-5.6 branch (shivji.jha:4500 to 4501) Bug#14659685
List-Archive: http://lists.mysql.com/commits/145307
X-Bug: 14659685
Message-Id: <20121030051707.13593.85957.4501@shiv-ThinkPad-T420>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4501 Shivji Kumar Jha	2012-10-30 [merge]
      BUG#14659685 - MAIN.MYSQLBINLOG_ROW_MYISAM.TEST MAIN.MYSQLBINLOG_ROW_INNODB.TEST
                     ARE SKIPPED
         merge from 5.5 into 5.6

    renamed:
      mysql-test/include/mysqlbinlog_row_engine.inc => mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc
      mysql-test/r/mysqlbinlog-cp932.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog-cp932.result
      mysql-test/r/mysqlbinlog_base64.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_base64.result
      mysql-test/r/mysqlbinlog_row.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
      mysql-test/r/mysqlbinlog_row_innodb.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
      mysql-test/r/mysqlbinlog_row_myisam.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
      mysql-test/r/mysqlbinlog_row_trans.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
      mysql-test/r/mysqlbinlog_start_stop.result => mysql-test/suite/binlog/r/binlog_mysqlbinlog_start_stop.result
      mysql-test/t/mysqlbinlog-cp932-master.opt => mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt
      mysql-test/t/mysqlbinlog-cp932.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test
      mysql-test/t/mysqlbinlog_base64.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_base64.test
      mysql-test/t/mysqlbinlog_row.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test
      mysql-test/t/mysqlbinlog_row_innodb.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test
      mysql-test/t/mysqlbinlog_row_myisam.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test
      mysql-test/t/mysqlbinlog_row_trans.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test
      mysql-test/t/mysqlbinlog_start_stop.test => mysql-test/suite/binlog/t/binlog_mysqlbinlog_start_stop.test
    modified:
      mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test
      mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test
 4500 magnus.blaudd@stripped	2012-10-29 [merge]
      Merge

    modified:
      mysql-test/include/write_result_to_file.inc
=== renamed file 'mysql-test/include/mysqlbinlog_row_engine.inc' => 'mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc'
=== renamed file 'mysql-test/r/mysqlbinlog-cp932.result' => 'mysql-test/suite/binlog/r/binlog_mysqlbinlog-cp932.result'
=== renamed file 'mysql-test/r/mysqlbinlog_base64.result' => 'mysql-test/suite/binlog/r/binlog_mysqlbinlog_base64.result'
=== renamed file 'mysql-test/r/mysqlbinlog_row.result' => 'mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result'
=== renamed file 'mysql-test/r/mysqlbinlog_row_innodb.result' => 'mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result'
=== renamed file 'mysql-test/r/mysqlbinlog_row_myisam.result' => 'mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result'
=== renamed file 'mysql-test/r/mysqlbinlog_row_trans.result' => 'mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result'
=== renamed file 'mysql-test/r/mysqlbinlog_start_stop.result' => 'mysql-test/suite/binlog/r/binlog_mysqlbinlog_start_stop.result'
=== renamed file 'mysql-test/t/mysqlbinlog-cp932-master.opt' => 'mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt'
=== renamed file 'mysql-test/t/mysqlbinlog-cp932.test' => 'mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test'
=== renamed file 'mysql-test/t/mysqlbinlog_base64.test' => 'mysql-test/suite/binlog/t/binlog_mysqlbinlog_base64.test'
=== renamed file 'mysql-test/t/mysqlbinlog_row.test' => 'mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test'
=== renamed file 'mysql-test/t/mysqlbinlog_row_innodb.test' => 'mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test'
--- a/mysql-test/t/mysqlbinlog_row_innodb.test	2011-11-20 21:00:25 +0000
+++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test	2012-10-30 05:13:43 +0000
@@ -21,5 +21,5 @@ let $engine_type=InnoDB;
 --source include/have_binlog_format_row.inc
 --source include/have_ucs2.inc 
 
---source include/mysqlbinlog_row_engine.inc
+--source extra/binlog_tests/mysqlbinlog_row_engine.inc
 

=== renamed file 'mysql-test/t/mysqlbinlog_row_myisam.test' => 'mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test'
--- a/mysql-test/t/mysqlbinlog_row_myisam.test	2008-08-20 14:06:31 +0000
+++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test	2012-10-30 05:10:07 +0000
@@ -20,4 +20,4 @@ let $engine_type=MyISAM;
 --source include/have_binlog_format_row.inc
 --source include/have_ucs2.inc 
 
---source include/mysqlbinlog_row_engine.inc
+--source extra/binlog_tests/mysqlbinlog_row_engine.inc

=== renamed file 'mysql-test/t/mysqlbinlog_row_trans.test' => 'mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test'
=== renamed file 'mysql-test/t/mysqlbinlog_start_stop.test' => 'mysql-test/suite/binlog/t/binlog_mysqlbinlog_start_stop.test'
No bundle (reason: useless for push emails).